From 0ccbb561412f76b1f7551e26dcc0a3f9c4a283a9 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Mon, 28 Oct 2019 09:57:28 +0800
Subject: migrate from intltool to gettext

---
 Makefile.am                |    1 +
 configure.ac               |    6 +-
 data/Locations.xml.in      | 8810 ++++++++++++++++++++++----------------------
 data/Makefile.am           |   15 +-
 its/locations.its          |    7 +
 its/locations.loc          |    6 +
 libmateweather/Makefile.am |    1 -
 po-locations/LINGUAS       |   85 +
 po/Makevars                |   79 +
 po/POTFILES.in             |    3 +-
 10 files changed, 4593 insertions(+), 4420 deletions(-)
 create mode 100644 its/locations.its
 create mode 100644 its/locations.loc
 create mode 100644 po-locations/LINGUAS
 create mode 100644 po/Makevars

diff --git a/Makefile.am b/Makefile.am
index 41eb67a..ae1a146 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	CFLAGS='-Wno-deprecated-declarations'
 
 EXTRA_DIST = \
+	its		\
 	autogen.sh
 
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 26e9166..1946f61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,6 @@ LT_PREREQ([2.2.6])
 LT_INIT([dlopen disable-static])
 LT_LIB_M
 
-IT_PROG_INTLTOOL([0.50.1])
-
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PROG_CC
@@ -79,10 +77,12 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED)
 
 dnl gettext
 
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=libmateweather
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-AM_GLIB_GNU_GETTEXT
 
 dnl icon cache
 AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
diff --git a/data/Locations.xml.in b/data/Locations.xml.in
index 7b876e0..5488867 100644
--- a/data/Locations.xml.in
+++ b/data/Locations.xml.in
@@ -2,10 +2,10 @@
 <!DOCTYPE mateweather SYSTEM "locations.dtd">
 <mateweather format="1.0">
   <region>
-    <_name>Africa</_name>
+    <name>Africa</name>
     <country>
       <!-- DZ - Algeria -->
-      <_name>Algeria</_name>
+      <name>Algeria</name>
       <!-- Could not find information about the following stations,
            which may be in Algeria:
            DAMR 
@@ -18,7 +18,7 @@
       <tz-hint>Africa/Algiers</tz-hint>
       <city>
         <!-- A city in Algeria -->
-        <_name>Adrar</_name>
+        <name>Adrar</name>
         <coordinates>27.900000 -0.283333</coordinates>
         <location>
           <name>Adrar</name>
@@ -31,7 +31,7 @@
              "Algiers" is the traditional English name.
              The local name in French is "Alger".
           -->
-        <_name>Algiers</_name>
+        <name>Algiers</name>
         <coordinates>36.763056 3.050556</coordinates>
         <location>
           <name>Dar-El-Beida</name>
@@ -41,7 +41,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Annaba</_name>
+        <name>Annaba</name>
         <coordinates>36.900000 7.766667</coordinates>
         <location>
           <name>Annaba</name>
@@ -51,7 +51,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Batna</_name>
+        <name>Batna</name>
         <coordinates>35.555278 6.178611</coordinates>
         <location>
           <name>Batna</name>
@@ -61,7 +61,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Bechar</_name>
+        <name>Bechar</name>
         <coordinates>31.616667 -2.216667</coordinates>
         <location>
           <name>Bechar</name>
@@ -71,7 +71,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Bejaia</_name>
+        <name>Bejaia</name>
         <coordinates>36.750000 5.083333</coordinates>
         <location>
           <name>Bejaia</name>
@@ -81,7 +81,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Berriane</_name>
+        <name>Berriane</name>
         <coordinates>32.833333 3.766667</coordinates>
         <location>
           <name>Tilrempt, Hassi R'mel Airport</name>
@@ -91,7 +91,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Biskra</_name>
+        <name>Biskra</name>
         <coordinates>34.850000 5.733333</coordinates>
         <location>
           <name>Biskra</name>
@@ -101,7 +101,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Bou Saada</_name>
+        <name>Bou Saada</name>
         <coordinates>35.214167 4.182500</coordinates>
         <location>
           <name>Bou Saada</name>
@@ -111,7 +111,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Chlef</_name>
+        <name>Chlef</name>
         <coordinates>36.164722 1.334722</coordinates>
         <location>
           <name>Chlef</name>
@@ -121,7 +121,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Constantine</_name>
+        <name>Constantine</name>
         <coordinates>36.365000 6.614722</coordinates>
         <location>
           <name>Constantine</name>
@@ -131,7 +131,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Dar el Beida</_name>
+        <name>Dar el Beida</name>
         <coordinates>36.713333 3.212500</coordinates>
         <location>
           <name>Dar el Beida</name>
@@ -141,7 +141,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Djanet</_name>
+        <name>Djanet</name>
         <coordinates>24.552500 9.482222</coordinates>
         <location>
           <name>Djanet</name>
@@ -151,7 +151,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>El Golea</_name>
+        <name>El Golea</name>
         <coordinates>30.566667 2.883333</coordinates>
         <location>
           <name>El Golea</name>
@@ -161,7 +161,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Ghardaia</_name>
+        <name>Ghardaia</name>
         <coordinates>32.483333 3.666667</coordinates>
         <location>
           <name>Ghardaia</name>
@@ -171,7 +171,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Hassi Messaoud</_name>
+        <name>Hassi Messaoud</name>
         <coordinates>31.701944 6.054444</coordinates>
         <location>
           <name>Hassi Messaoud</name>
@@ -181,7 +181,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>I-n-Amenas</_name>
+        <name>I-n-Amenas</name>
         <coordinates>28.050000 9.550000</coordinates>
         <location>
           <name>I-n-Amenas</name>
@@ -191,7 +191,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>I-n-Salah</_name>
+        <name>I-n-Salah</name>
         <coordinates>27.216667 2.466667</coordinates>
         <location>
           <name>In Salah North</name>
@@ -201,7 +201,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Illizi</_name>
+        <name>Illizi</name>
         <coordinates>26.483333 8.466667</coordinates>
         <location>
           <name>Illizi</name>
@@ -211,7 +211,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Jijel</_name>
+        <name>Jijel</name>
         <coordinates>36.800000 5.766667</coordinates>
         <location>
           <name>Jijel Achouat</name>
@@ -221,7 +221,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Laghouat</_name>
+        <name>Laghouat</name>
         <coordinates>33.800000 2.883333</coordinates>
         <location>
           <name>Laghouat</name>
@@ -231,7 +231,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Mascara</_name>
+        <name>Mascara</name>
         <coordinates>35.394444 0.139722</coordinates>
         <location>
           <name>Mascara-Ghriss</name>
@@ -241,7 +241,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Oran</_name>
+        <name>Oran</name>
         <coordinates>35.691111 -0.641667</coordinates>
         <location>
           <name>Es Senia Airport</name>
@@ -256,7 +256,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Ouargla</_name>
+        <name>Ouargla</name>
         <coordinates>31.957500 5.327778</coordinates>
         <location>
           <name>Ouargla</name>
@@ -266,7 +266,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Setif</_name>
+        <name>Setif</name>
         <coordinates>36.191389 5.409444</coordinates>
         <location>
           <name>Setif</name>
@@ -276,7 +276,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Sidi Amrane</_name>
+        <name>Sidi Amrane</name>
         <coordinates>33.500000 6.016667</coordinates>
         <location>
           <name>El Oued</name>
@@ -286,7 +286,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Sidi Bel Abbes</_name>
+        <name>Sidi Bel Abbes</name>
         <coordinates>35.193889 -0.641389</coordinates>
         <location>
           <name>Mecheria</name>
@@ -296,7 +296,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Tamanrasset</_name>
+        <name>Tamanrasset</name>
         <coordinates>22.785000 5.522778</coordinates>
         <location>
           <name>Aguenna Airport</name>
@@ -306,7 +306,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Tebessa</_name>
+        <name>Tebessa</name>
         <coordinates>35.404167 8.124167</coordinates>
         <location>
           <name>Tebessa</name>
@@ -316,7 +316,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Tiaret</_name>
+        <name>Tiaret</name>
         <coordinates>35.375833 1.313056</coordinates>
         <location>
           <name>Tiaret</name>
@@ -326,7 +326,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Timimoun</_name>
+        <name>Timimoun</name>
         <coordinates>29.250000 0.250000</coordinates>
         <location>
           <name>Timimoun</name>
@@ -336,7 +336,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Tindouf</_name>
+        <name>Tindouf</name>
         <coordinates>27.651944 -8.214444</coordinates>
         <location>
           <name>Tindouf</name>
@@ -346,7 +346,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Tlemcen</_name>
+        <name>Tlemcen</name>
         <coordinates>34.878333 -1.315000</coordinates>
         <location>
           <name>Tlemcen Zenata</name>
@@ -356,7 +356,7 @@
       </city>
       <city>
         <!-- A city in Algeria -->
-        <_name>Touggourt</_name>
+        <name>Touggourt</name>
         <coordinates>33.100000 6.066667</coordinates>
         <location>
           <name>Touggourt</name>
@@ -367,7 +367,7 @@
     </country>
     <country>
       <!-- AO - Angola -->
-      <_name>Angola</_name>
+      <name>Angola</name>
       <!-- Could not find weather stations for the following major
            cities:
            Luanda
@@ -381,7 +381,7 @@
     </country>
     <country>
       <!-- BJ - Benin -->
-      <_name>Benin</_name>
+      <name>Benin</name>
       <iso-code>BJ</iso-code>
       <fips-code>BN</fips-code>
       <timezones>
@@ -390,7 +390,7 @@
       <tz-hint>Africa/Porto-Novo</tz-hint>
       <city>
         <!-- A city in Benin -->
-        <_name>Cotonou</_name>
+        <name>Cotonou</name>
         <coordinates>6.350000 2.433333</coordinates>
         <location>
           <name>Cotonou</name>
@@ -400,7 +400,7 @@
       </city>
       <city>
         <!-- The capital of Benin -->
-        <_name>Porto-Novo</_name>
+        <name>Porto-Novo</name>
         <coordinates>6.483333 2.616667</coordinates>
         <location>
           <name>Cotonou</name>
@@ -411,7 +411,7 @@
     </country>
     <country>
       <!-- BW - Botswana -->
-      <_name>Botswana</_name>
+      <name>Botswana</name>
       <iso-code>BW</iso-code>
       <fips-code>BC</fips-code>
       <timezones>
@@ -420,7 +420,7 @@
       <tz-hint>Africa/Gaborone</tz-hint>
       <city>
         <!-- A city in Botswana -->
-        <_name>Francistown</_name>
+        <name>Francistown</name>
         <coordinates>-21.166667 27.516667</coordinates>
         <location>
           <name>Francistown</name>
@@ -430,7 +430,7 @@
       </city>
       <city>
         <!-- The capital of Botswana -->
-        <_name>Gaborone</_name>
+        <name>Gaborone</name>
         <coordinates>-24.646389 25.911944</coordinates>
         <location>
           <name>Seretse Khama International Airport</name>
@@ -440,7 +440,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Ghanzi</_name>
+        <name>Ghanzi</name>
         <coordinates>-21.566667 21.783333</coordinates>
         <location>
           <name>Ghanzi</name>
@@ -450,7 +450,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Kasane</_name>
+        <name>Kasane</name>
         <coordinates>-17.816667 25.150000</coordinates>
         <location>
           <name>Kasane</name>
@@ -460,7 +460,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Letlhakane</_name>
+        <name>Letlhakane</name>
         <coordinates>-21.416667 25.583333</coordinates>
         <location>
           <name>Letlhakane</name>
@@ -470,7 +470,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Lokerane</_name>
+        <name>Lokerane</name>
         <coordinates>-24.883333 24.666667</coordinates>
         <location>
           <name>Jwaneng</name>
@@ -480,7 +480,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Maun</_name>
+        <name>Maun</name>
         <coordinates>-19.983333 23.416667</coordinates>
         <location>
           <name>Maun</name>
@@ -490,7 +490,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Mochudi</_name>
+        <name>Mochudi</name>
         <coordinates>-24.416667 26.150000</coordinates>
         <location>
           <name>Seretse Khama International Airport</name>
@@ -500,7 +500,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Selebi-Phikwe</_name>
+        <name>Selebi-Phikwe</name>
         <coordinates>-21.966111 27.917222</coordinates>
         <location>
           <name>Selebi-Phikwe</name>
@@ -510,7 +510,7 @@
       </city>
       <city>
         <!-- A city in Botswana -->
-        <_name>Tshabong</_name>
+        <name>Tshabong</name>
         <coordinates>-26.050000 22.450000</coordinates>
         <location>
           <name>Tshabong</name>
@@ -521,7 +521,7 @@
     </country>
     <country>
       <!-- BF - Burkina Faso -->
-      <_name>Burkina Faso</_name>
+      <name>Burkina Faso</name>
       <iso-code>BF</iso-code>
       <fips-code>UV</fips-code>
       <timezones>
@@ -530,7 +530,7 @@
       <tz-hint>Africa/Ouagadougou</tz-hint>
       <city>
         <!-- The capital of Burkina Faso -->
-        <_name>Ouagadougou</_name>
+        <name>Ouagadougou</name>
         <coordinates>12.370278 -1.524722</coordinates>
         <location>
           <name>Ouagadougou</name>
@@ -541,7 +541,7 @@
     </country>
     <country>
       <!-- BI - Burundi -->
-      <_name>Burundi</_name>
+      <name>Burundi</name>
       <iso-code>BI</iso-code>
       <fips-code>BY</fips-code>
       <timezones>
@@ -550,7 +550,7 @@
       <tz-hint>Africa/Bujumbura</tz-hint>
       <city>
         <!-- The capital of Burundi -->
-        <_name>Bujumbura</_name>
+        <name>Bujumbura</name>
         <coordinates>-3.376111 29.360000</coordinates>
         <location>
           <name>Bujumbura</name>
@@ -561,7 +561,7 @@
     </country>
     <country>
       <!-- CM - Cameroon -->
-      <_name>Cameroon</_name>
+      <name>Cameroon</name>
       <!-- Could not find information about the following stations,
            which may be in Cameroon:
            FKKL 
@@ -574,7 +574,7 @@
       <tz-hint>Africa/Douala</tz-hint>
       <city>
         <!-- A city in Cameroon -->
-        <_name>Douala</_name>
+        <name>Douala</name>
         <coordinates>4.050278 9.700000</coordinates>
         <location>
           <name>Douala Observatory</name>
@@ -584,7 +584,7 @@
       </city>
       <city>
         <!-- A city in Cameroon -->
-        <_name>Garoua</_name>
+        <name>Garoua</name>
         <coordinates>9.300000 13.400000</coordinates>
         <location>
           <name>Garoua</name>
@@ -594,7 +594,7 @@
       </city>
       <city>
         <!-- A city in Cameroon -->
-        <_name>Ngaoundere</_name>
+        <name>Ngaoundere</name>
         <coordinates>7.316667 13.583333</coordinates>
         <location>
           <name>Ngaoundere</name>
@@ -604,7 +604,7 @@
       </city>
       <city>
         <!-- The capital of Cameroon -->
-        <_name>Yaounde</_name>
+        <name>Yaounde</name>
         <coordinates>3.866667 11.516667</coordinates>
         <location>
           <name>Yaounde</name>
@@ -615,7 +615,7 @@
     </country>
     <country>
       <!-- CV - Cape Verde -->
-      <_name>Cape Verde</_name>
+      <name>Cape Verde</name>
       <!-- Could not find information about the following stations,
            which may be in Cape Verde:
            GVNP 
@@ -632,7 +632,7 @@
       <tz-hint>Atlantic/Cape_Verde</tz-hint>
       <city>
         <!-- A city in Cape Verde -->
-        <_name>Preguiça</_name>
+        <name>Preguiça</name>
         <coordinates>16.750000 -22.950000</coordinates>
         <location>
           <name>Sal</name>
@@ -643,7 +643,7 @@
     </country>
     <country>
       <!-- CF - Central African Republic -->
-      <_name>Central African Republic</_name>
+      <name>Central African Republic</name>
       <iso-code>CF</iso-code>
       <fips-code>CT</fips-code>
       <timezones>
@@ -652,7 +652,7 @@
       <tz-hint>Africa/Bangui</tz-hint>
       <city>
         <!-- A city in the Central African Republic -->
-        <_name>Bangassou</_name>
+        <name>Bangassou</name>
         <coordinates>4.733333 22.816667</coordinates>
         <location>
           <name>Bangassou</name>
@@ -662,7 +662,7 @@
       </city>
       <city>
         <!-- The capital of the Central African Republic -->
-        <_name>Bangui</_name>
+        <name>Bangui</name>
         <coordinates>4.366667 18.583333</coordinates>
         <location>
           <name>Bangui</name>
@@ -672,7 +672,7 @@
       </city>
       <city>
         <!-- A city in the Central African Republic -->
-        <_name>Berberati</_name>
+        <name>Berberati</name>
         <coordinates>4.266667 15.783333</coordinates>
         <location>
           <name>Berberati</name>
@@ -683,7 +683,7 @@
     </country>
     <country>
       <!-- TD - Chad -->
-      <_name>Chad</_name>
+      <name>Chad</name>
       <iso-code>TD</iso-code>
       <fips-code>CD</fips-code>
       <timezones>
@@ -692,7 +692,7 @@
       <tz-hint>Africa/Ndjamena</tz-hint>
       <city>
         <!-- A city in Chad -->
-        <_name>Moundou</_name>
+        <name>Moundou</name>
         <coordinates>8.566667 16.083333</coordinates>
         <location>
           <name>Moundou</name>
@@ -702,7 +702,7 @@
       </city>
       <city>
         <!-- The capital of Chad -->
-        <_name>N'Djamena</_name>
+        <name>N'Djamena</name>
         <coordinates>12.108502 15.048173</coordinates>
         <location>
           <name>N'Djamena</name>
@@ -712,7 +712,7 @@
       </city>
       <city>
         <!-- A city in Chad -->
-        <_name>Sarh</_name>
+        <name>Sarh</name>
         <coordinates>9.150000 18.383333</coordinates>
         <location>
           <name>Sarh</name>
@@ -723,7 +723,7 @@
     </country>
     <country>
       <!-- KM - Comoros -->
-      <_name>Comoros</_name>
+      <name>Comoros</name>
       <iso-code>KM</iso-code>
       <fips-code>CN</fips-code>
       <timezones>
@@ -732,7 +732,7 @@
       <tz-hint>Indian/Comoro</tz-hint>
       <city>
         <!-- A city in Comoros -->
-        <_name>Mbaléni</_name>
+        <name>Mbaléni</name>
         <coordinates>-11.550000 43.274167</coordinates>
         <location>
           <name>Hahaya International Airport</name>
@@ -742,7 +742,7 @@
       </city>
       <city>
         <!-- The capital of Comoros -->
-        <_name>Moroni</_name>
+        <name>Moroni</name>
         <coordinates>-11.704167 43.240278</coordinates>
         <location>
           <name>Hahaya International Airport</name>
@@ -753,7 +753,7 @@
     </country>
     <country>
       <!-- CD - Democratic Republic of the Congo -->
-      <_name>Congo, Democratic Republic of the</_name>
+      <name>Congo, Democratic Republic of the</name>
       <iso-code>CD</iso-code>
       <fips-code>CG</fips-code>
       <timezones>
@@ -764,7 +764,7 @@
                clear from context. FIXME: is there an official name for
                this zone?
             -->
-          <_name>Western Congo</_name>
+          <name>Western Congo</name>
         </timezone>
         <timezone id="Africa/Lubumbashi">
           <!-- The time zone used in the eastern half of the Democratic
@@ -773,12 +773,12 @@
                clear from context. FIXME: is there an official name for
                this zone?
             -->
-          <_name>Eastern Congo</_name>
+          <name>Eastern Congo</name>
         </timezone>
       </timezones>
       <city>
         <!-- The capital of the Democratic Republic of the Congo -->
-        <_name>Kinshasa</_name>
+        <name>Kinshasa</name>
         <coordinates>-4.329722 15.315000</coordinates>
         <location>
           <name>N'Djili Airport</name>
@@ -794,7 +794,7 @@
            better distinguish it from CD (The Democratic Republic of
            the Congo).
         -->
-      <_name>Congo, Republic of the</_name>
+      <name>Congo, Republic of the</name>
       <iso-code>CG</iso-code>
       <fips-code>CF</fips-code>
       <timezones>
@@ -803,7 +803,7 @@
       <tz-hint>Africa/Brazzaville</tz-hint>
       <city>
         <!-- The capital of the Republic of the Congo -->
-        <_name>Brazzaville</_name>
+        <name>Brazzaville</name>
         <coordinates>-4.259167 15.284722</coordinates>
         <location>
           <name>Maya-Maya Airport</name>
@@ -813,7 +813,7 @@
       </city>
       <city>
         <!-- A city in the Republic of the Congo -->
-        <_name>Pointe-Noire</_name>
+        <name>Pointe-Noire</name>
         <coordinates>-4.794722 11.846111</coordinates>
         <location>
           <name>Pointe-Noire</name>
@@ -824,7 +824,7 @@
     </country>
     <country>
       <!-- CI - Côte d'Ivoire -->
-      <_name>Côte d'Ivoire</_name>
+      <name>Côte d'Ivoire</name>
       <!-- Could not find weather stations for the following major
            cities:
            Yamoussoukro
@@ -837,7 +837,7 @@
       <tz-hint>Africa/Abidjan</tz-hint>
       <city>
         <!-- A city in Côte d'Ivoire -->
-        <_name>Abidjan</_name>
+        <name>Abidjan</name>
         <coordinates>5.341111 -4.028056</coordinates>
         <location>
           <name>Abidjan</name>
@@ -848,7 +848,7 @@
     </country>
     <country>
       <!-- DJ - Djibouti -->
-      <_name msgctxt="Country">Djibouti</_name>
+      <name msgctxt="Country">Djibouti</name>
       <iso-code>DJ</iso-code>
       <fips-code>DJ</fips-code>
       <timezones>
@@ -857,7 +857,7 @@
       <tz-hint>Africa/Djibouti</tz-hint>
       <city>
         <!-- The capital of Djibouti -->
-        <_name msgctxt="City in Djibouti">Djibouti</_name>
+        <name msgctxt="City in Djibouti">Djibouti</name>
         <coordinates>11.595000 43.148056</coordinates>
         <location>
           <name>Djibouti / Ambouli</name>
@@ -868,7 +868,7 @@
     </country>
     <country>
       <!-- EG - Egypt -->
-      <_name>Egypt</_name>
+      <name>Egypt</name>
       <!-- Could not find information about the following stations,
            which may be in Egypt:
            HEBL HEIS HEMA HESC 
@@ -881,7 +881,7 @@
       <tz-hint>Africa/Cairo</tz-hint>
       <city>
         <!-- A city in Egypt -->
-        <_name>Al 'Arish</_name>
+        <name>Al 'Arish</name>
         <coordinates>31.126111 33.801944</coordinates>
         <location>
           <name>Al 'Arish</name>
@@ -891,7 +891,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Al Ghardaqah</_name>
+        <name>Al Ghardaqah</name>
         <coordinates>27.238889 33.836111</coordinates>
         <location>
           <name>Hurguada</name>
@@ -901,7 +901,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Al Qabuti</_name>
+        <name>Al Qabuti</name>
         <coordinates>31.237778 32.281389</coordinates>
         <location>
           <name>Port Said</name>
@@ -914,7 +914,7 @@
              "Alexandria" is the traditional English name.
              The local name in Arabic is "Al Iskandariyah".
           -->
-        <_name msgctxt="City in Egypt">Alexandria</_name>
+        <name msgctxt="City in Egypt">Alexandria</name>
         <coordinates>31.198056 29.919167</coordinates>
         <location>
           <name>Nouzha Airport</name>
@@ -929,7 +929,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Aswan</_name>
+        <name>Aswan</name>
         <coordinates>24.087500 32.898889</coordinates>
         <location>
           <name>Asswan</name>
@@ -939,7 +939,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Asyut</_name>
+        <name>Asyut</name>
         <coordinates>27.182778 31.182778</coordinates>
         <location>
           <name>Asyut</name>
@@ -952,7 +952,7 @@
              "Cairo" is the traditional English name.
              The local name in Arabic is "Al Qahirah".
           -->
-        <_name msgctxt="City in Egypt">Cairo</_name>
+        <name msgctxt="City in Egypt">Cairo</name>
         <coordinates>30.050000 31.250000</coordinates>
         <location>
           <name>Cairo Airport</name>
@@ -965,7 +965,7 @@
              "Luxor" is the traditional English name.
              The local name in Arabic is "Al Uqsur".
           -->
-        <_name>Luxor</_name>
+        <name>Luxor</name>
         <coordinates>25.683333 32.650000</coordinates>
         <location>
           <name>Luxor</name>
@@ -975,7 +975,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Marsa Matruh</_name>
+        <name>Marsa Matruh</name>
         <coordinates>31.350000 27.233333</coordinates>
         <location>
           <name>Marsa Matruh</name>
@@ -985,7 +985,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Sharm ash Shaykh</_name>
+        <name>Sharm ash Shaykh</name>
         <coordinates>27.863611 34.288056</coordinates>
         <location>
           <name>Sharm ash Shaykh International Airport</name>
@@ -995,7 +995,7 @@
       </city>
       <city>
         <!-- A city in Egypt -->
-        <_name>Taba</_name>
+        <name>Taba</name>
         <coordinates>29.491944 34.891389</coordinates>
         <location>
           <name>Taba</name>
@@ -1006,7 +1006,7 @@
     </country>
     <country>
       <!-- GQ - Equatorial Guinea -->
-      <_name>Equatorial Guinea</_name>
+      <name>Equatorial Guinea</name>
       <!-- Could not find information about the following stations,
            which may be in Equatorial Guinea:
            FGBT 
@@ -1019,7 +1019,7 @@
       <tz-hint>Africa/Malabo</tz-hint>
       <city>
         <!-- The capital of Equatorial Guinea -->
-        <_name>Malabo</_name>
+        <name>Malabo</name>
         <coordinates>3.750000 8.783333</coordinates>
         <location>
           <name>Malabo / Fernando Poo</name>
@@ -1030,7 +1030,7 @@
     </country>
     <country>
       <!-- ER - Eritrea -->
-      <_name>Eritrea</_name>
+      <name>Eritrea</name>
       <!-- Could not find weather stations for the following major
            cities:
            Asmera
@@ -1044,7 +1044,7 @@
     </country>
     <country>
       <!-- ET - Ethiopia -->
-      <_name>Ethiopia</_name>
+      <name>Ethiopia</name>
       <!-- Could not find weather stations for the following major
            cities:
            Addis Ababa
@@ -1062,7 +1062,7 @@
            Indian Ocean. The French name is "Terres australes
            françaises".
         -->
-      <_name>French Southern Territories</_name>
+      <name>French Southern Territories</name>
       <iso-code>TF</iso-code>
       <fips-code>FS</fips-code>
       <timezones>
@@ -1072,7 +1072,7 @@
     </country>
     <country>
       <!-- GA - Gabon -->
-      <_name>Gabon</_name>
+      <name>Gabon</name>
       <iso-code>GA</iso-code>
       <fips-code>GB</fips-code>
       <timezones>
@@ -1081,7 +1081,7 @@
       <tz-hint>Africa/Libreville</tz-hint>
       <city>
         <!-- A city in Gabon -->
-        <_name>Franceville</_name>
+        <name>Franceville</name>
         <coordinates>-1.633333 13.583333</coordinates>
         <location>
           <name>Mvengue Airport</name>
@@ -1091,7 +1091,7 @@
       </city>
       <city>
         <!-- The capital of Gabon -->
-        <_name>Libreville</_name>
+        <name>Libreville</name>
         <coordinates>0.383333 9.450000</coordinates>
         <location>
           <name>Libreville</name>
@@ -1101,7 +1101,7 @@
       </city>
       <city>
         <!-- A city in Gabon -->
-        <_name>Port-Gentil</_name>
+        <name>Port-Gentil</name>
         <coordinates>-0.716667 8.783333</coordinates>
         <location>
           <name>Port-Gentil</name>
@@ -1112,7 +1112,7 @@
     </country>
     <country>
       <!-- GM - Gambia -->
-      <_name>Gambia</_name>
+      <name>Gambia</name>
       <iso-code>GM</iso-code>
       <fips-code>GA</fips-code>
       <timezones>
@@ -1121,7 +1121,7 @@
       <tz-hint>Africa/Banjul</tz-hint>
       <city>
         <!-- The capital of Gambia -->
-        <_name>Banjul</_name>
+        <name>Banjul</name>
         <coordinates>13.453056 -16.577500</coordinates>
         <location>
           <name>Banjul / Old Yundum</name>
@@ -1132,7 +1132,7 @@
     </country>
     <country>
       <!-- GH - Ghana -->
-      <_name>Ghana</_name>
+      <name>Ghana</name>
       <iso-code>GH</iso-code>
       <fips-code>GH</fips-code>
       <timezones>
@@ -1141,7 +1141,7 @@
       <tz-hint>Africa/Accra</tz-hint>
       <city>
         <!-- The capital of Ghana -->
-        <_name>Accra</_name>
+        <name>Accra</name>
         <coordinates>5.550000 -0.216667</coordinates>
         <location>
           <name>Accra</name>
@@ -1152,7 +1152,7 @@
     </country>
     <country>
       <!-- GN - Guinea -->
-      <_name>Guinea</_name>
+      <name>Guinea</name>
       <iso-code>GN</iso-code>
       <fips-code>GV</fips-code>
       <timezones>
@@ -1161,7 +1161,7 @@
       <tz-hint>Africa/Conakry</tz-hint>
       <city>
         <!-- The capital of Guinea -->
-        <_name>Conakry</_name>
+        <name>Conakry</name>
         <coordinates>9.509167 -13.712222</coordinates>
         <location>
           <name>Conakry / Gbessia</name>
@@ -1172,7 +1172,7 @@
     </country>
     <country>
       <!-- GW - Guinea-Bissau -->
-      <_name>Guinea-Bissau</_name>
+      <name>Guinea-Bissau</name>
       <!-- Could not find weather stations for the following major
            cities:
            Bissau
@@ -1186,7 +1186,7 @@
     </country>
     <country>
       <!-- KE - Kenya -->
-      <_name>Kenya</_name>
+      <name>Kenya</name>
       <iso-code>KE</iso-code>
       <fips-code>KE</fips-code>
       <timezones>
@@ -1195,7 +1195,7 @@
       <tz-hint>Africa/Nairobi</tz-hint>
       <city>
         <!-- A city in Kenya -->
-        <_name>Eldoret</_name>
+        <name>Eldoret</name>
         <coordinates>0.516667 35.283333</coordinates>
         <location>
           <name>Eldoret</name>
@@ -1205,7 +1205,7 @@
       </city>
       <city>
         <!-- A city in Kenya -->
-        <_name>Kisumu</_name>
+        <name>Kisumu</name>
         <coordinates>-0.100000 34.750000</coordinates>
         <location>
           <name>Kisumu</name>
@@ -1215,7 +1215,7 @@
       </city>
       <city>
         <!-- A city in Kenya -->
-        <_name>Mombasa</_name>
+        <name>Mombasa</name>
         <coordinates>-4.050000 39.666667</coordinates>
         <location>
           <name>Mombasa</name>
@@ -1225,7 +1225,7 @@
       </city>
       <city>
         <!-- The capital of Kenya -->
-        <_name>Nairobi</_name>
+        <name>Nairobi</name>
         <coordinates>-1.283333 36.816667</coordinates>
         <location>
           <name>Jomo Kenyatta Airport</name>
@@ -1236,7 +1236,7 @@
     </country>
     <country>
       <!-- LS - Lesotho -->
-      <_name>Lesotho</_name>
+      <name>Lesotho</name>
       <!-- Could not find weather stations for the following major
            cities:
            Maseru
@@ -1250,7 +1250,7 @@
     </country>
     <country>
       <!-- LR - Liberia -->
-      <_name msgctxt="Country">Liberia</_name>
+      <name msgctxt="Country">Liberia</name>
       <!-- Could not find weather stations for the following major
            cities:
            Monrovia
@@ -1264,7 +1264,7 @@
     </country>
     <country>
       <!-- LY - Libyan Arab Jamahiriya -->
-      <_name>Libya</_name>
+      <name>Libya</name>
       <iso-code>LY</iso-code>
       <fips-code>LY</fips-code>
       <timezones>
@@ -1273,7 +1273,7 @@
       <tz-hint>Africa/Tripoli</tz-hint>
       <city>
         <!-- A city in Libya -->
-        <_name>Baninah</_name>
+        <name>Baninah</name>
         <coordinates>32.083333 20.266667</coordinates>
         <location>
           <name>Baninah</name>
@@ -1283,7 +1283,7 @@
       </city>
       <city>
         <!-- A city in Libya -->
-        <_name>Sabha</_name>
+        <name>Sabha</name>
         <coordinates>27.033333 14.433333</coordinates>
         <location>
           <name>Sabha</name>
@@ -1296,7 +1296,7 @@
              "Tripoli" is the traditional English name.
              The local name in Arabic is "Tarabulus / طرابلس".
           -->
-        <_name>Tripoli</_name>
+        <name>Tripoli</name>
         <coordinates>32.892500 13.180000</coordinates>
         <location>
           <name>Tripoli International Airport</name>
@@ -1307,7 +1307,7 @@
     </country>
     <country>
       <!-- MG - Madagascar -->
-      <_name>Madagascar</_name>
+      <name>Madagascar</name>
       <iso-code>MG</iso-code>
       <fips-code>MA</fips-code>
       <timezones>
@@ -1316,7 +1316,7 @@
       <tz-hint>Indian/Antananarivo</tz-hint>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Ankarena</_name>
+        <name>Ankarena</name>
         <coordinates>-17.083333 49.816667</coordinates>
         <location>
           <name>Sainte-Marie Airport</name>
@@ -1326,7 +1326,7 @@
       </city>
       <city>
         <!-- The capital of Madagascar -->
-        <_name>Antananarivo</_name>
+        <name>Antananarivo</name>
         <coordinates>-18.916667 47.516667</coordinates>
         <location>
           <name>Ivato Airport</name>
@@ -1336,7 +1336,7 @@
       </city>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Antsiranana</_name>
+        <name>Antsiranana</name>
         <coordinates>-12.266667 49.283333</coordinates>
         <location>
           <name>Antsiranana</name>
@@ -1346,7 +1346,7 @@
       </city>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Fasenina-Ampasy</_name>
+        <name>Fasenina-Ampasy</name>
         <coordinates>-13.300000 48.316667</coordinates>
         <location>
           <name>Fascene Nossi-Be</name>
@@ -1356,7 +1356,7 @@
       </city>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Mahajanga</_name>
+        <name>Mahajanga</name>
         <coordinates>-15.716667 46.316667</coordinates>
         <location>
           <name>Mahajanga</name>
@@ -1366,7 +1366,7 @@
       </city>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Toamasina</_name>
+        <name>Toamasina</name>
         <coordinates>-18.166667 49.383333</coordinates>
         <location>
           <name>Toamasina</name>
@@ -1376,7 +1376,7 @@
       </city>
       <city>
         <!-- A city in Madagascar -->
-        <_name>Tolanaro</_name>
+        <name>Tolanaro</name>
         <coordinates>-25.033333 47.000000</coordinates>
         <location>
           <name>Tolanaro</name>
@@ -1387,7 +1387,7 @@
     </country>
     <country>
       <!-- MW - Malawi -->
-      <_name>Malawi</_name>
+      <name>Malawi</name>
       <!-- Could not find weather stations for the following major
            cities:
            Lilongwe
@@ -1401,7 +1401,7 @@
     </country>
     <country>
       <!-- ML - Mali -->
-      <_name>Mali</_name>
+      <name>Mali</name>
       <!-- Could not find weather stations for the following major
            cities:
            Bamako
@@ -1415,7 +1415,7 @@
     </country>
     <country>
       <!-- MR - Mauritania -->
-      <_name>Mauritania</_name>
+      <name>Mauritania</name>
       <iso-code>MR</iso-code>
       <fips-code>MR</fips-code>
       <timezones>
@@ -1424,7 +1424,7 @@
       <tz-hint>Africa/Nouakchott</tz-hint>
       <city>
         <!-- A city in Mauritania -->
-        <_name>Nouadhibou</_name>
+        <name>Nouadhibou</name>
         <coordinates>20.902500 -17.042222</coordinates>
         <location>
           <name>Nouadhibou</name>
@@ -1434,7 +1434,7 @@
       </city>
       <city>
         <!-- The capital of Mauritania -->
-        <_name>Nouakchott</_name>
+        <name>Nouakchott</name>
         <coordinates>18.119444 -16.040556</coordinates>
         <location>
           <name>Nouakchott</name>
@@ -1445,7 +1445,7 @@
     </country>
     <country>
       <!-- MU - Mauritius -->
-      <_name>Mauritius</_name>
+      <name>Mauritius</name>
       <iso-code>MU</iso-code>
       <fips-code>MP</fips-code>
       <timezones>
@@ -1454,7 +1454,7 @@
       <tz-hint>Indian/Mauritius</tz-hint>
       <city>
         <!-- A city in Mauritius -->
-        <_name>Plaisance</_name>
+        <name>Plaisance</name>
         <coordinates>-20.418333 57.671389</coordinates>
         <location>
           <name>Plaisance Mauritius</name>
@@ -1464,7 +1464,7 @@
       </city>
       <city>
         <!-- The capital of Mauritius -->
-        <_name>Port Louis</_name>
+        <name>Port Louis</name>
         <coordinates>-20.161944 57.498889</coordinates>
         <location>
           <name>Plaisance Mauritius</name>
@@ -1474,7 +1474,7 @@
       </city>
       <city>
         <!-- A city in Mauritius -->
-        <_name>Port Mathurin</_name>
+        <name>Port Mathurin</name>
         <coordinates>-19.683333 63.416667</coordinates>
         <location>
           <name>Rodrigues</name>
@@ -1485,7 +1485,7 @@
     </country>
     <country>
       <!-- YT - Mayotte -->
-      <_name>Mayotte</_name>
+      <name>Mayotte</name>
       <iso-code>YT</iso-code>
       <fips-code>MF</fips-code>
       <timezones>
@@ -1494,7 +1494,7 @@
       <tz-hint>Indian/Mayotte</tz-hint>
       <city>
         <!-- A city in Mayotte -->
-        <_name>Dzaoudzi</_name>
+        <name>Dzaoudzi</name>
         <coordinates>-12.779444 45.253611</coordinates>
         <location>
           <name>Dzaoudzi / Pamanzi Mayotte</name>
@@ -1504,7 +1504,7 @@
       </city>
       <city>
         <!-- The capital of Mayotte -->
-        <_name>Mamoudzou</_name>
+        <name>Mamoudzou</name>
         <coordinates>-12.779444 45.227222</coordinates>
         <location>
           <name>Dzaoudzi / Pamanzi Mayotte</name>
@@ -1515,7 +1515,7 @@
     </country>
     <country>
       <!-- MA - Morocco -->
-      <_name>Morocco</_name>
+      <name>Morocco</name>
       <!-- Could not find cities for the following weather stations:
            GMML - Laayoune, Hassan Isl Airport (27.166667 -13.216389)
         -->
@@ -1527,7 +1527,7 @@
       <tz-hint>Africa/Casablanca</tz-hint>
       <city>
         <!-- A city in Morocco -->
-        <_name>Agadir</_name>
+        <name>Agadir</name>
         <coordinates>30.400000 -9.600000</coordinates>
         <location>
           <name>Agadir Al Massira</name>
@@ -1537,7 +1537,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Al Hoceima</_name>
+        <name>Al Hoceima</name>
         <coordinates>35.240000 -3.930000</coordinates>
         <location>
           <name>Al Hoceima</name>
@@ -1547,7 +1547,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Fes</_name>
+        <name>Fes</name>
         <coordinates>34.050000 -4.980000</coordinates>
         <location>
           <name>Fes-Sais</name>
@@ -1557,7 +1557,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Marrakech</_name>
+        <name>Marrakech</name>
         <coordinates>31.630000 -8.000000</coordinates>
         <location>
           <name>Marrakech</name>
@@ -1567,7 +1567,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Meknes</_name>
+        <name>Meknes</name>
         <coordinates>33.900000 -5.550000</coordinates>
         <location>
           <name>Meknes</name>
@@ -1577,7 +1577,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Nador</_name>
+        <name>Nador</name>
         <coordinates>35.170000 -2.930000</coordinates>
         <location>
           <name>Arwi Airport</name>
@@ -1587,7 +1587,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Nouaseur</_name>
+        <name>Nouaseur</name>
         <coordinates>33.380000 -7.610000</coordinates>
         <location>
           <name>Nouasseur</name>
@@ -1597,7 +1597,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Ouarzazat</_name>
+        <name>Ouarzazat</name>
         <coordinates>30.920000 -6.910000</coordinates>
         <location>
           <name>Ouarzazat</name>
@@ -1607,7 +1607,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Oujda</_name>
+        <name>Oujda</name>
         <coordinates>34.680000 -1.910000</coordinates>
         <location>
           <name>Oujda</name>
@@ -1617,7 +1617,7 @@
       </city>
       <city>
         <!-- The capital of Morocco -->
-        <_name>Rabat</_name>
+        <name>Rabat</name>
         <coordinates>34.020000 -6.830000</coordinates>
         <location>
           <name>Rabat-Sale</name>
@@ -1630,7 +1630,7 @@
              "Tangier" is the traditional English name.
              The local name is "Tanger".
           -->
-        <_name>Tangier</_name>
+        <name>Tangier</name>
         <coordinates>35.780000 -5.810000</coordinates>
         <location>
           <name>Tangier Airport</name>
@@ -1640,7 +1640,7 @@
       </city>
       <city>
         <!-- A city in Morocco -->
-        <_name>Tetouan</_name>
+        <name>Tetouan</name>
         <coordinates>35.570000 -5.370000</coordinates>
         <location>
           <name>Sania Ramel Airport</name>
@@ -1651,7 +1651,7 @@
     </country>
     <country>
       <!-- MZ - Mozambique -->
-      <_name>Mozambique</_name>
+      <name>Mozambique</name>
       <iso-code>MZ</iso-code>
       <fips-code>MZ</fips-code>
       <timezones>
@@ -1660,7 +1660,7 @@
       <tz-hint>Africa/Maputo</tz-hint>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Beira</_name>
+        <name>Beira</name>
         <coordinates>-19.843611 34.838889</coordinates>
         <location>
           <name>Beira</name>
@@ -1670,7 +1670,7 @@
       </city>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Chimoio</_name>
+        <name>Chimoio</name>
         <coordinates>-19.116389 33.483333</coordinates>
         <location>
           <name>Chimoio</name>
@@ -1680,7 +1680,7 @@
       </city>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Lichinga</_name>
+        <name>Lichinga</name>
         <coordinates>-13.312778 35.240556</coordinates>
         <location>
           <name>Lichinga</name>
@@ -1690,7 +1690,7 @@
       </city>
       <city>
         <!-- The capital of Mozambique -->
-        <_name>Maputo</_name>
+        <name>Maputo</name>
         <coordinates>-25.965278 32.589167</coordinates>
         <location>
           <name>Maputo / Mavalane</name>
@@ -1700,7 +1700,7 @@
       </city>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Nampula</_name>
+        <name>Nampula</name>
         <coordinates>-15.119722 39.264722</coordinates>
         <location>
           <name>Nampula</name>
@@ -1710,7 +1710,7 @@
       </city>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Pemba</_name>
+        <name>Pemba</name>
         <coordinates>-12.960833 40.507778</coordinates>
         <location>
           <name>Pemba</name>
@@ -1720,7 +1720,7 @@
       </city>
       <city>
         <!-- A city in Mozambique -->
-        <_name>Quelimane</_name>
+        <name>Quelimane</name>
         <coordinates>-17.878611 36.888333</coordinates>
         <location>
           <name>Quelimane</name>
@@ -1731,7 +1731,7 @@
     </country>
     <country>
       <!-- NA - Namibia -->
-      <_name>Namibia</_name>
+      <name>Namibia</name>
       <iso-code>NA</iso-code>
       <fips-code>WA</fips-code>
       <timezones>
@@ -1750,7 +1750,7 @@
     </country>
     <country>
       <!-- NE - Niger -->
-      <_name>Niger</_name>
+      <name>Niger</name>
       <iso-code>NE</iso-code>
       <fips-code>NG</fips-code>
       <timezones>
@@ -1759,7 +1759,7 @@
       <tz-hint>Africa/Niamey</tz-hint>
       <city>
         <!-- A city in Niger -->
-        <_name>Agadez</_name>
+        <name>Agadez</name>
         <coordinates>16.973333 7.991111</coordinates>
         <location>
           <name>Agadez</name>
@@ -1769,7 +1769,7 @@
       </city>
       <city>
         <!-- The capital of Niger -->
-        <_name>Niamey</_name>
+        <name>Niamey</name>
         <coordinates>13.516667 2.116667</coordinates>
         <location>
           <name>Niamey Airport</name>
@@ -1779,7 +1779,7 @@
       </city>
       <city>
         <!-- A city in Niger -->
-        <_name>Zinder</_name>
+        <name>Zinder</name>
         <coordinates>13.804869 8.988371</coordinates>
         <location>
           <name>Zinder</name>
@@ -1790,7 +1790,7 @@
     </country>
     <country>
       <!-- NG - Nigeria -->
-      <_name>Nigeria</_name>
+      <name>Nigeria</name>
       <!-- Could not find information about the following stations,
            which may be in Nigeria:
            DNAA DNMN 
@@ -1812,7 +1812,7 @@
       </city>
       <city>
         <!-- A city in Lagos Nigeria -->
-        <_name>Ikeja</_name>
+        <name>Ikeja</name>
         <coordinates>6.596667 3.343056</coordinates>
         <location>
           <name>Ikeja</name>
@@ -1822,7 +1822,7 @@
       </city>
       <city>
         <!-- A city in Nigeria -->
-        <_name>Ilorin</_name>
+        <name>Ilorin</name>
         <coordinates>8.500000 4.550000</coordinates>
         <location>
           <name>Ilorin</name>
@@ -1832,7 +1832,7 @@
       </city>
       <city>
         <!-- A city in Nigeria -->
-        <_name>Kaduna</_name>
+        <name>Kaduna</name>
         <coordinates>10.523056 7.440278</coordinates>
         <location>
           <name>Kaduna</name>
@@ -1842,7 +1842,7 @@
       </city>
       <city>
         <!-- A city in Nigeria -->
-        <_name>Kano</_name>
+        <name>Kano</name>
         <coordinates>11.996389 8.516667</coordinates>
         <location>
           <name>Kano</name>
@@ -1852,7 +1852,7 @@
       </city>
       <city>
         <!-- A city in Nigeria -->
-        <_name>Port Harcourt</_name>
+        <name>Port Harcourt</name>
         <coordinates>4.789167 6.998611</coordinates>
         <location>
           <name>Port Harcourt</name>
@@ -1863,7 +1863,7 @@
     </country>
     <country>
       <!-- RW - Rwanda -->
-      <_name>Rwanda</_name>
+      <name>Rwanda</name>
       <!-- Could not find weather stations for the following major
            cities:
            Kigali
@@ -1879,7 +1879,7 @@
       <!-- RE - Réunion, an overseas department of France in the Indian
            Ocean.
         -->
-      <_name>Réunion</_name>
+      <name>Réunion</name>
       <iso-code>RE</iso-code>
       <fips-code>RE</fips-code>
       <timezones>
@@ -1888,7 +1888,7 @@
       <tz-hint>Indian/Reunion</tz-hint>
       <city>
         <!-- The capital of Réunion -->
-        <_name>Saint-Denis</_name>
+        <name>Saint-Denis</name>
         <coordinates>-20.866667 55.466667</coordinates>
         <location>
           <name>Saint-Denis / Gillot</name>
@@ -1898,7 +1898,7 @@
       </city>
       <city>
         <!-- A city in Réunion -->
-        <_name msgctxt="City in Réunion">Saint-Pierre</_name>
+        <name msgctxt="City in Réunion">Saint-Pierre</name>
         <coordinates>-21.316667 55.483333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -1912,7 +1912,7 @@
            "São Tomé and Príncipe". The official ISO 3166 short English
            name does not have the accents.
         -->
-      <_name>Sao Tome and Principe</_name>
+      <name>Sao Tome and Principe</name>
       <!-- Could not find weather stations for the following major
            cities:
            São Tomé
@@ -1926,7 +1926,7 @@
     </country>
     <country>
       <!-- SN - Senegal -->
-      <_name>Senegal</_name>
+      <name>Senegal</name>
       <iso-code>SN</iso-code>
       <fips-code>SG</fips-code>
       <timezones>
@@ -1935,7 +1935,7 @@
       <tz-hint>Africa/Dakar</tz-hint>
       <city>
         <!-- A city in Senegal -->
-        <_name>Boukot Ouolof</_name>
+        <name>Boukot Ouolof</name>
         <coordinates>12.416389 -16.750556</coordinates>
         <location>
           <name>Cap-Skirring</name>
@@ -1945,7 +1945,7 @@
       </city>
       <city>
         <!-- The capital of Senegal -->
-        <_name>Dakar</_name>
+        <name>Dakar</name>
         <coordinates>14.736667 -17.633889</coordinates>
         <location>
           <name>Dakar-Yoff Airport</name>
@@ -1955,7 +1955,7 @@
       </city>
       <city>
         <!-- A city in Senegal -->
-        <_name>Saint-Louis</_name>
+        <name>Saint-Louis</name>
         <coordinates>16.032222 -16.616667</coordinates>
         <location>
           <name>Saint-Louis</name>
@@ -1965,7 +1965,7 @@
       </city>
       <city>
         <!-- A city in Senegal -->
-        <_name>Tambacounda</_name>
+        <name>Tambacounda</name>
         <coordinates>13.753889 -13.758611</coordinates>
         <location>
           <name>Tambacounda</name>
@@ -1975,7 +1975,7 @@
       </city>
       <city>
         <!-- A city in Senegal -->
-        <_name>Ziguinchor</_name>
+        <name>Ziguinchor</name>
         <coordinates>12.583333 -16.271944</coordinates>
         <location>
           <name>Ziguinchor</name>
@@ -1986,7 +1986,7 @@
     </country>
     <country>
       <!-- SC - Seychelles -->
-      <_name>Seychelles</_name>
+      <name>Seychelles</name>
       <iso-code>SC</iso-code>
       <fips-code>SE</fips-code>
       <timezones>
@@ -1995,7 +1995,7 @@
       <tz-hint>Indian/Mahe</tz-hint>
       <city>
         <!-- A city in the Seychelles -->
-        <_name>Cascade</_name>
+        <name>Cascade</name>
         <coordinates>-4.666667 55.500000</coordinates>
         <location>
           <name>Seychelles International Airport</name>
@@ -2005,7 +2005,7 @@
       </city>
       <city>
         <!-- The capital of the Seychelles -->
-        <_name msgctxt="City in Seychelles">Victoria</_name>
+        <name msgctxt="City in Seychelles">Victoria</name>
         <coordinates>-4.616667 55.450000</coordinates>
         <location>
           <name>Seychelles International Airport</name>
@@ -2016,7 +2016,7 @@
     </country>
     <country>
       <!-- SL - Sierra Leone -->
-      <_name>Sierra Leone</_name>
+      <name>Sierra Leone</name>
       <iso-code>SL</iso-code>
       <fips-code>SL</fips-code>
       <timezones>
@@ -2025,7 +2025,7 @@
       <tz-hint>Africa/Freetown</tz-hint>
       <city>
         <!-- The capital of Sierra Leone -->
-        <_name>Freetown</_name>
+        <name>Freetown</name>
         <coordinates>8.490000 -13.234167</coordinates>
         <location>
           <name>Lungi</name>
@@ -2035,7 +2035,7 @@
       </city>
       <city>
         <!-- A city in Sierra Leone -->
-        <_name>Lungi</_name>
+        <name>Lungi</name>
         <coordinates>8.640833 -13.221944</coordinates>
         <location>
           <name>Lungi</name>
@@ -2046,7 +2046,7 @@
     </country>
     <country>
       <!-- SO - Somalia -->
-      <_name>Somalia</_name>
+      <name>Somalia</name>
       <!-- Could not find weather stations for the following major
            cities:
            Mogadishu
@@ -2060,7 +2060,7 @@
     </country>
     <country>
       <!-- ZA - South Africa -->
-      <_name>South Africa</_name>
+      <name>South Africa</name>
       <!-- Could not find information about the following stations,
            which may be in South Africa:
            FAGC FAJB FAKN FAPN FAPP 
@@ -2073,7 +2073,7 @@
       <tz-hint>Africa/Johannesburg</tz-hint>
       <city>
         <!-- A city in South Africa -->
-        <_name>Bloemfontein</_name>
+        <name>Bloemfontein</name>
         <coordinates>-29.133333 26.200000</coordinates>
         <location>
           <name>Bloemfontein Airport</name>
@@ -2083,7 +2083,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Cape Town</_name>
+        <name>Cape Town</name>
         <coordinates>-33.916667 18.416667</coordinates>
         <location>
           <name>Cape Town International Airport</name>
@@ -2093,7 +2093,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Durban</_name>
+        <name>Durban</name>
         <coordinates>-29.850000 31.016667</coordinates>
         <location>
           <name>Durban International Airport</name>
@@ -2103,7 +2103,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Johannesburg</_name>
+        <name>Johannesburg</name>
         <coordinates>-26.200000 28.083333</coordinates>
         <location>
           <name>O. R. Tambo International Airport</name>
@@ -2118,7 +2118,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Klerksdorp</_name>
+        <name>Klerksdorp</name>
         <coordinates>-26.866667 26.666667</coordinates>
         <location>
           <name>Klerksdorp</name>
@@ -2128,7 +2128,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Port Elizabeth</_name>
+        <name>Port Elizabeth</name>
         <coordinates>-33.966667 25.583333</coordinates>
         <location>
           <name>Port Elizabeth, Port E Apt</name>
@@ -2138,7 +2138,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Potchefstroom</_name>
+        <name>Potchefstroom</name>
         <coordinates>-26.716667 27.100000</coordinates>
         <location>
           <name>Potchefstroom</name>
@@ -2148,7 +2148,7 @@
       </city>
       <city>
         <!-- The capital of South Africa -->
-        <_name>Pretoria</_name>
+        <name>Pretoria</name>
         <coordinates>-25.706944 28.229444</coordinates>
         <location>
           <name>Lanseria</name>
@@ -2158,7 +2158,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Springs</_name>
+        <name>Springs</name>
         <coordinates>-26.250000 28.400000</coordinates>
         <location>
           <name>Springs</name>
@@ -2168,7 +2168,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Upington</_name>
+        <name>Upington</name>
         <coordinates>-28.450000 21.250000</coordinates>
         <location>
           <name>Upington, Up-Apt</name>
@@ -2178,7 +2178,7 @@
       </city>
       <city>
         <!-- A city in South Africa -->
-        <_name>Vereeniging</_name>
+        <name>Vereeniging</name>
         <coordinates>-26.666667 27.933333</coordinates>
         <location>
           <name>Vereeniging</name>
@@ -2189,7 +2189,7 @@
     </country>
     <country>
       <!-- SD - Sudan -->
-      <_name>Sudan</_name>
+      <name>Sudan</name>
       <iso-code>SD</iso-code>
       <fips-code>SU</fips-code>
       <timezones>
@@ -2201,7 +2201,7 @@
              "Khartoum" is the traditional English name.
              The local name in Arabic is "Al Khartum".
           -->
-        <_name>Khartoum</_name>
+        <name>Khartoum</name>
         <coordinates>15.588056 32.534167</coordinates>
         <location>
           <name>Khartoum</name>
@@ -2212,7 +2212,7 @@
     </country>
     <country>
       <!-- SZ - Swaziland -->
-      <_name>Swaziland</_name>
+      <name>Swaziland</name>
       <!-- Could not find information about the following stations,
            which may be in Swaziland:
            FDBB FDHL FDST 
@@ -2225,7 +2225,7 @@
       <tz-hint>Africa/Mbabane</tz-hint>
       <city>
         <!-- The capital of Swaziland -->
-        <_name>Lobamba</_name>
+        <name>Lobamba</name>
         <coordinates>-26.466667 31.200000</coordinates>
         <location>
           <name>Manzini, Matsapa Airport</name>
@@ -2235,7 +2235,7 @@
       </city>
       <city>
         <!-- A city in Swaziland -->
-        <_name>Manzini</_name>
+        <name>Manzini</name>
         <coordinates>-26.483333 31.366667</coordinates>
         <location>
           <name>Matsapa Airport</name>
@@ -2245,7 +2245,7 @@
       </city>
       <city>
         <!-- The capital of Swaziland -->
-        <_name>Mbabane</_name>
+        <name>Mbabane</name>
         <coordinates>-26.316667 31.133333</coordinates>
         <location>
           <name>Manzini, Matsapa Airport</name>
@@ -2256,7 +2256,7 @@
     </country>
     <country>
       <!-- TZ - United Republic of Tanzania -->
-      <_name>Tanzania</_name>
+      <name>Tanzania</name>
       <!-- Could not find information about the following stations,
            which may be in Tanzania:
            HTSU 
@@ -2269,7 +2269,7 @@
       <tz-hint>Africa/Dar_es_Salaam</tz-hint>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Arusha</_name>
+        <name>Arusha</name>
         <coordinates>-3.366667 36.683333</coordinates>
         <location>
           <name>Arusha</name>
@@ -2279,7 +2279,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Bukoba</_name>
+        <name>Bukoba</name>
         <coordinates>-1.331667 31.812222</coordinates>
         <location>
           <name>Bukoba</name>
@@ -2289,7 +2289,7 @@
       </city>
       <city>
         <!-- The capital of Tanzania -->
-        <_name>Dar es Salaam</_name>
+        <name>Dar es Salaam</name>
         <coordinates>-6.800000 39.283333</coordinates>
         <location>
           <name>Dar es Salaam Airport</name>
@@ -2299,7 +2299,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Dodoma</_name>
+        <name>Dodoma</name>
         <coordinates>-6.183333 35.750000</coordinates>
         <location>
           <name>Dodoma</name>
@@ -2309,7 +2309,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Iringa</_name>
+        <name>Iringa</name>
         <coordinates>-7.766667 35.700000</coordinates>
         <location>
           <name>Iringa</name>
@@ -2319,7 +2319,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Kigoma</_name>
+        <name>Kigoma</name>
         <coordinates>-4.876944 29.626667</coordinates>
         <location>
           <name>Kigoma</name>
@@ -2329,7 +2329,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Mbeya</_name>
+        <name>Mbeya</name>
         <coordinates>-8.900000 33.450000</coordinates>
         <location>
           <name>Mbeya</name>
@@ -2339,7 +2339,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Morogoro</_name>
+        <name>Morogoro</name>
         <coordinates>-6.816667 37.666667</coordinates>
         <location>
           <name>Morogoro</name>
@@ -2349,7 +2349,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Moshi</_name>
+        <name>Moshi</name>
         <coordinates>-3.350000 37.333333</coordinates>
         <location>
           <name>Kilimanjaro Airport</name>
@@ -2359,7 +2359,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Mtwara</_name>
+        <name>Mtwara</name>
         <coordinates>-10.266667 40.183333</coordinates>
         <location>
           <name>Mtwara</name>
@@ -2369,7 +2369,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Musoma</_name>
+        <name>Musoma</name>
         <coordinates>-1.500000 33.800000</coordinates>
         <location>
           <name>Musoma</name>
@@ -2379,7 +2379,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Mwanza</_name>
+        <name>Mwanza</name>
         <coordinates>-2.516667 32.900000</coordinates>
         <location>
           <name>Mwanza</name>
@@ -2389,7 +2389,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Songea</_name>
+        <name>Songea</name>
         <coordinates>-10.683333 35.650000</coordinates>
         <location>
           <name>Songea</name>
@@ -2399,7 +2399,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Tabora</_name>
+        <name>Tabora</name>
         <coordinates>-5.016667 32.800000</coordinates>
         <location>
           <name>Tabora Airport</name>
@@ -2409,7 +2409,7 @@
       </city>
       <city>
         <!-- A city in Tanzania -->
-        <_name>Zanzibar</_name>
+        <name>Zanzibar</name>
         <coordinates>-6.166667 39.183333</coordinates>
         <location>
           <name>Zanzibar / Kisauni</name>
@@ -2420,7 +2420,7 @@
     </country>
     <country>
       <!-- TG - Togo -->
-      <_name>Togo</_name>
+      <name>Togo</name>
       <iso-code>TG</iso-code>
       <fips-code>TO</fips-code>
       <timezones>
@@ -2429,7 +2429,7 @@
       <tz-hint>Africa/Lome</tz-hint>
       <city>
         <!-- The capital of Togo -->
-        <_name>Lome</_name>
+        <name>Lome</name>
         <coordinates>6.131944 1.222778</coordinates>
         <location>
           <name>Lome</name>
@@ -2439,7 +2439,7 @@
       </city>
       <city>
         <!-- A city in Togo -->
-        <_name>Niamtougou</_name>
+        <name>Niamtougou</name>
         <coordinates>9.768056 1.105278</coordinates>
         <location>
           <name>Niamtougou</name>
@@ -2450,7 +2450,7 @@
     </country>
     <country>
       <!-- TN - Tunisia -->
-      <_name>Tunisia</_name>
+      <name>Tunisia</name>
       <iso-code>TN</iso-code>
       <fips-code>TS</fips-code>
       <timezones>
@@ -2459,7 +2459,7 @@
       <tz-hint>Africa/Tunis</tz-hint>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Bizerte</_name>
+        <name>Bizerte</name>
         <coordinates>37.274444 9.873889</coordinates>
         <location>
           <name>Bizerte</name>
@@ -2469,7 +2469,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>El Borma</_name>
+        <name>El Borma</name>
         <coordinates>31.666667 9.133333</coordinates>
         <location>
           <name>El Borma</name>
@@ -2479,7 +2479,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Gabes</_name>
+        <name>Gabes</name>
         <coordinates>33.883333 10.116667</coordinates>
         <location>
           <name>Gabes</name>
@@ -2489,7 +2489,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Gafsa</_name>
+        <name>Gafsa</name>
         <coordinates>34.425000 8.784167</coordinates>
         <location>
           <name>Gafsa</name>
@@ -2499,7 +2499,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Houmt Souk</_name>
+        <name>Houmt Souk</name>
         <coordinates>33.874722 10.859167</coordinates>
         <location>
           <name>Djerba Mellita</name>
@@ -2509,7 +2509,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Jendouba</_name>
+        <name>Jendouba</name>
         <coordinates>36.501111 8.779444</coordinates>
         <location>
           <name>Jendouba</name>
@@ -2519,7 +2519,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Kairouan</_name>
+        <name>Kairouan</name>
         <coordinates>35.674444 10.101667</coordinates>
         <location>
           <name>Kairouan</name>
@@ -2529,7 +2529,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Monastir</_name>
+        <name>Monastir</name>
         <coordinates>35.783333 10.833333</coordinates>
         <location>
           <name>Habib Bourguiba</name>
@@ -2539,7 +2539,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Qulaybiyah</_name>
+        <name>Qulaybiyah</name>
         <coordinates>36.850000 11.100000</coordinates>
         <location>
           <name>Qulaybiyah</name>
@@ -2549,7 +2549,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Remada</_name>
+        <name>Remada</name>
         <coordinates>32.316667 10.400000</coordinates>
         <location>
           <name>Remada</name>
@@ -2559,7 +2559,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Sfax</_name>
+        <name>Sfax</name>
         <coordinates>34.740556 10.760278</coordinates>
         <location>
           <name>Sfax El-Maou</name>
@@ -2569,7 +2569,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Tabarka</_name>
+        <name>Tabarka</name>
         <coordinates>36.954444 8.758056</coordinates>
         <location>
           <name>Tabarka</name>
@@ -2579,7 +2579,7 @@
       </city>
       <city>
         <!-- A city in Tunisia -->
-        <_name>Tozeur</_name>
+        <name>Tozeur</name>
         <coordinates>33.920556 8.133333</coordinates>
         <location>
           <name>Tozeur</name>
@@ -2589,7 +2589,7 @@
       </city>
       <city>
         <!-- The capital of Tunisia -->
-        <_name>Tunis</_name>
+        <name>Tunis</name>
         <coordinates>36.802778 10.179722</coordinates>
         <location>
           <name>Tunis-Carthage</name>
@@ -2600,7 +2600,7 @@
     </country>
     <country>
       <!-- UG - Uganda -->
-      <_name>Uganda</_name>
+      <name>Uganda</name>
       <iso-code>UG</iso-code>
       <fips-code>UG</fips-code>
       <timezones>
@@ -2609,7 +2609,7 @@
       <tz-hint>Africa/Kampala</tz-hint>
       <city>
         <!-- A city in Uganda -->
-        <_name>Arua</_name>
+        <name>Arua</name>
         <coordinates>3.019167 30.930833</coordinates>
         <location>
           <name>Arua</name>
@@ -2619,7 +2619,7 @@
       </city>
       <city>
         <!-- A city in Uganda -->
-        <_name>Entebbe</_name>
+        <name>Entebbe</name>
         <coordinates>0.064444 32.446944</coordinates>
         <location>
           <name>Entebbe Airport</name>
@@ -2629,7 +2629,7 @@
       </city>
       <city>
         <!-- A city in Uganda -->
-        <_name>Kabale</_name>
+        <name>Kabale</name>
         <coordinates>-1.326111 30.003889</coordinates>
         <location>
           <name>Kabale</name>
@@ -2639,7 +2639,7 @@
       </city>
       <city>
         <!-- The capital of Uganda -->
-        <_name>Kampala</_name>
+        <name>Kampala</name>
         <coordinates>0.315556 32.565556</coordinates>
         <location>
           <name>Entebbe Airport</name>
@@ -2650,7 +2650,7 @@
     </country>
     <country>
       <!-- EH - Western Sahara, a disputed territory in western Africa -->
-      <_name>Western Sahara</_name>
+      <name>Western Sahara</name>
       <iso-code>EH</iso-code>
       <fips-code>WI</fips-code>
       <timezones>
@@ -2660,7 +2660,7 @@
     </country>
     <country>
       <!-- ZM - Zambia -->
-      <_name>Zambia</_name>
+      <name>Zambia</name>
       <iso-code>ZM</iso-code>
       <fips-code>ZA</fips-code>
       <timezones>
@@ -2669,7 +2669,7 @@
       <tz-hint>Africa/Lusaka</tz-hint>
       <city>
         <!-- A city in Zambia -->
-        <_name>Chinganze</_name>
+        <name>Chinganze</name>
         <coordinates>-13.266667 31.916667</coordinates>
         <location>
           <name>Mfuwe</name>
@@ -2679,7 +2679,7 @@
       </city>
       <city>
         <!-- A city in Zambia -->
-        <_name>Livingstone</_name>
+        <name>Livingstone</name>
         <coordinates>-17.850000 25.866667</coordinates>
         <location>
           <name>Livingstone</name>
@@ -2689,7 +2689,7 @@
       </city>
       <city>
         <!-- The capital of Zambia -->
-        <_name>Lusaka</_name>
+        <name>Lusaka</name>
         <coordinates>-15.416667 28.283333</coordinates>
         <location>
           <name>Lusaka International Airport</name>
@@ -2699,7 +2699,7 @@
       </city>
       <city>
         <!-- A city in Zambia -->
-        <_name>Ndola</_name>
+        <name>Ndola</name>
         <coordinates>-12.966667 28.633333</coordinates>
         <location>
           <name>Ndola</name>
@@ -2710,7 +2710,7 @@
     </country>
     <country>
       <!-- ZW - Zimbabwe -->
-      <_name>Zimbabwe</_name>
+      <name>Zimbabwe</name>
       <!-- Could not find weather stations for the following major
            cities:
            Harare
@@ -2724,10 +2724,10 @@
     </country>
   </region>
   <region>
-    <_name msgctxt="Region">Antarctica</_name>
+    <name msgctxt="Region">Antarctica</name>
     <country>
       <!-- AQ - Antarctica -->
-      <_name msgctxt="Country">Antarctica</_name>
+      <name msgctxt="Country">Antarctica</name>
       <iso-code>AQ</iso-code>
       <fips-code>AY</fips-code>
       <timezones>
@@ -2737,42 +2737,42 @@
                in places where "Antarctica" is already clear from
                context.
             -->
-          <_name>Palmer Station (Chile Time)</_name>
+          <name>Palmer Station (Chile Time)</name>
         </timezone>
         <timezone id="Antarctica/Rothera">
           <!-- A British research station in Antarctica. The string is
                only used in places where "Antarctica" is already clear
                from context.
             -->
-          <_name>Rothera Research Station</_name>
+          <name>Rothera Research Station</name>
         </timezone>
         <timezone id="Antarctica/Syowa">
           <!-- A Japanese research station in Antarctica. The string is
                only used in places where "Antarctica" is already clear
                from context.
             -->
-          <_name>Showa Station</_name>
+          <name>Showa Station</name>
         </timezone>
         <timezone id="Antarctica/Mawson">
           <!-- An Australian research station in Antarctica. The string
                is only used in places where "Antarctica" is already
                clear from context.
             -->
-          <_name>Mawson Station</_name>
+          <name>Mawson Station</name>
         </timezone>
         <timezone id="Antarctica/Vostok">
           <!-- A Russian research station in Antarctica. The string is
                only used in places where "Antarctica" is already clear
                from context.
             -->
-          <_name>Vostok Station</_name>
+          <name>Vostok Station</name>
         </timezone>
         <timezone id="Antarctica/Davis">
           <!-- An Australian research station in Antarctica. The string
                is only used in places where "Antarctica" is already
                clear from context.
             -->
-          <_name>Davis Station</_name>
+          <name>Davis Station</name>
         </timezone>
         <timezone id="Antarctica/Casey">
           <!-- An Australian research station in Antarctica, which
@@ -2780,28 +2780,28 @@
                only used in places where "Antarctica" is already clear
                from context.
             -->
-          <_name>Casey Station (Western Australia Time)</_name>
+          <name>Casey Station (Western Australia Time)</name>
         </timezone>
         <timezone id="Antarctica/DumontDUrville">
           <!-- A French research station in Antarctica. The string is
                only used in places where "Antarctica" is already clear
                from context.
             -->
-          <_name>Dumont d'Urville Station</_name>
+          <name>Dumont d'Urville Station</name>
         </timezone>
         <timezone id="Antarctica/McMurdo">
           <!-- An American research station in Antarctica, which keeps
                the same time as New Zealand. The string is only used in
                places where "Antarctica" is already clear from context.
             -->
-          <_name>McMurdo Station (New Zealand Time)</_name>
+          <name>McMurdo Station (New Zealand Time)</name>
         </timezone>
         <timezone id="Antarctica/South_Pole">
           <!-- An American research station in Antarctica, which keeps
                the same time as New Zealand. The string is only used in
                places where "Antarctica" is already clear from context.
             -->
-          <_name>Amundsen-Scott South Pole Station (New Zealand Time)</_name>
+          <name>Amundsen-Scott South Pole Station (New Zealand Time)</name>
         </timezone>
       </timezones>
       <tz-hint>Antarctica/McMurdo</tz-hint>
@@ -2820,10 +2820,10 @@
     </country>
   </region>
   <region>
-    <_name>Asia</_name>
+    <name>Asia</name>
     <country>
       <!-- AF - Afghanistan -->
-      <_name>Afghanistan</_name>
+      <name>Afghanistan</name>
       <iso-code>AF</iso-code>
       <fips-code>AF</fips-code>
       <timezones>
@@ -2832,7 +2832,7 @@
       <tz-hint>Asia/Kabul</tz-hint>
       <city>
         <!-- A city in Afghanistan -->
-        <_name>Herat</_name>
+        <name>Herat</name>
         <coordinates>34.346944 62.198333</coordinates>
         <location>
           <name>Herat</name>
@@ -2845,7 +2845,7 @@
              "Kabul" is the traditional English name.
              The local name in Persian is "Kabol".
           -->
-        <_name>Kabul</_name>
+        <name>Kabul</name>
         <coordinates>34.516667 69.183333</coordinates>
         <location>
           <name>Kabul Airport</name>
@@ -2856,7 +2856,7 @@
     </country>
     <country>
       <!-- AM - Armenia -->
-      <_name>Armenia</_name>
+      <name>Armenia</name>
       <!-- Could not find information about the following stations,
            which may be in Armenia:
            UDSG 
@@ -2869,7 +2869,7 @@
       <tz-hint>Asia/Yerevan</tz-hint>
       <city>
         <!-- The capital of Armenia -->
-        <_name>Yerevan</_name>
+        <name>Yerevan</name>
         <coordinates>40.181111 44.513611</coordinates>
         <location>
           <name>Yerevan</name>
@@ -2880,7 +2880,7 @@
     </country>
     <country>
       <!-- AZ - Azerbaijan -->
-      <_name>Azerbaijan</_name>
+      <name>Azerbaijan</name>
       <!-- Could not find information about the following stations,
            which may be in Azerbaijan:
            UBBN 
@@ -2896,7 +2896,7 @@
              "Baku" is the traditional English name.
              The local name is "Baki".
           -->
-        <_name>Baku</_name>
+        <name>Baku</name>
         <coordinates>40.395278 49.882222</coordinates>
         <location>
           <name>Bine Airport</name>
@@ -2906,7 +2906,7 @@
       </city>
       <city>
         <!-- A city in Azerbaijan -->
-        <_name>Ganca</_name>
+        <name>Ganca</name>
         <coordinates>40.682778 46.360556</coordinates>
         <location>
           <name>Ganca Airport</name>
@@ -2917,7 +2917,7 @@
     </country>
     <country>
       <!-- BD - Bangladesh -->
-      <_name>Bangladesh</_name>
+      <name>Bangladesh</name>
       <!-- Could not find weather stations for the following major
            cities:
            Barisal, Cox's Bazar, Habiganj, Khulna, Rajshahi, Sylhet
@@ -2932,7 +2932,7 @@
         <!-- A city in Bangladesh.
              The local name in Bengali is "চট্টগ্রাম".
           -->
-        <_name>Chittagong</_name>
+        <name>Chittagong</name>
         <coordinates>22.333056 91.836389</coordinates>
         <location>
           <name>Chittagong Patenga</name>
@@ -2944,7 +2944,7 @@
         <!-- The capital of Bangladesh.
              The local name in Bengali is "ঢাকা".
           -->
-        <_name>Dhaka</_name>
+        <name>Dhaka</name>
         <coordinates>23.723056 90.408611</coordinates>
         <location>
           <name>Kurmitola, Dia</name>
@@ -2954,7 +2954,7 @@
       </city>
       <city>
         <!-- A city in Bangladesh -->
-        <_name>Solpur</_name>
+        <name>Solpur</name>
         <coordinates>23.850000 90.400000</coordinates>
         <location>
           <name>Kurmitola, Dia</name>
@@ -2965,7 +2965,7 @@
     </country>
     <country>
       <!-- BT - Bhutan -->
-      <_name>Bhutan</_name>
+      <name>Bhutan</name>
       <!-- Could not find weather stations for the following major
            cities:
            Thimphu
@@ -2979,7 +2979,7 @@
     </country>
     <country>
       <!-- BN - Brunei Darussalam -->
-      <_name>Brunei</_name>
+      <name>Brunei</name>
       <iso-code>BN</iso-code>
       <fips-code>BX</fips-code>
       <timezones>
@@ -2988,7 +2988,7 @@
       <tz-hint>Asia/Brunei</tz-hint>
       <city>
         <!-- The capital of Brunei -->
-        <_name>Bandar Seri Begawan</_name>
+        <name>Bandar Seri Begawan</name>
         <coordinates>4.883333 114.933333</coordinates>
         <location>
           <name>Bandar Seri Begawan Airport</name>
@@ -2999,7 +2999,7 @@
     </country>
     <country>
       <!-- KH - Cambodia -->
-      <_name>Cambodia</_name>
+      <name>Cambodia</name>
       <iso-code>KH</iso-code>
       <fips-code>CB</fips-code>
       <timezones>
@@ -3011,7 +3011,7 @@
              "Phnom Penh" is the traditional English name.
              The local name in Khmer is "Phnum Penh".
           -->
-        <_name>Phnom Penh</_name>
+        <name>Phnom Penh</name>
         <coordinates>11.550000 104.916667</coordinates>
         <location>
           <name>Phnom Penh / Pouthichentong</name>
@@ -3021,7 +3021,7 @@
       </city>
       <city>
         <!-- A city in Cambodia -->
-        <_name>Siemreab</_name>
+        <name>Siemreab</name>
         <coordinates>13.366667 103.850000</coordinates>
         <location>
           <name>Siemreab</name>
@@ -3034,7 +3034,7 @@
       <!-- CN - China. (The official ISO 3166 short English name does
            not include "The People's Republic of".)
         -->
-      <_name>China</_name>
+      <name>China</name>
       <!-- Could not find information about the following stations,
            which may be in China:
            ZBSJ ZJHK 
@@ -3052,13 +3052,13 @@
       <tz-hint>Asia/Shanghai</tz-hint>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Anhui</_name>
+        <name>Anhui</name>
         <fips-code>CH01</fips-code>
         <city>
           <!-- A city in Anhui in China.
                The name is also written "合肥".
             -->
-          <_name>Hefei</_name>
+          <name>Hefei</name>
           <coordinates>31.863889 117.280833</coordinates>
           <location>
             <name>Hefei</name>
@@ -3069,11 +3069,11 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name msgctxt="State in China">Beijing</_name>
+        <name msgctxt="State in China">Beijing</name>
         <fips-code>CH22</fips-code>
         <city>
           <!-- The capital of China -->
-          <_name msgctxt="City in Beijing, China">Beijing</_name>
+          <name msgctxt="City in Beijing, China">Beijing</name>
           <coordinates>39.928889 116.388333</coordinates>
           <location>
             <name>Beijing</name>
@@ -3084,13 +3084,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name msgctxt="State in China">Chongqing</_name>
+        <name msgctxt="State in China">Chongqing</name>
         <fips-code>CH33</fips-code>
         <city>
           <!-- A city in Chongqing in China.
                The name is also written "重庆".
             -->
-          <_name msgctxt="City in Chongqing, China">Chongqing</_name>
+          <name msgctxt="City in Chongqing, China">Chongqing</name>
           <coordinates>29.562778 106.552778</coordinates>
           <location>
             <name>Chongqing</name>
@@ -3101,13 +3101,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Fujian</_name>
+        <name>Fujian</name>
         <fips-code>CH07</fips-code>
         <city>
           <!-- A city in Fujian in China.
                The name is also written "福州".
             -->
-          <_name>Fuzhou</_name>
+          <name>Fuzhou</name>
           <coordinates>26.061389 119.306111</coordinates>
           <location>
             <name>Fuzhou</name>
@@ -3119,7 +3119,7 @@
           <!-- A city in Fujian in China.
                The name is also written "厦门".
             -->
-          <_name>Xiamen</_name>
+          <name>Xiamen</name>
           <coordinates>24.479794 118.081869</coordinates>
           <location>
             <name>Xiamen</name>
@@ -3130,13 +3130,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Gansu</_name>
+        <name>Gansu</name>
         <fips-code>CH15</fips-code>
         <city>
           <!-- A city in Gansu in China.
                The name is also written "兰州".
             -->
-          <_name>Lanzhou</_name>
+          <name>Lanzhou</name>
           <coordinates>36.056389 103.792222</coordinates>
           <location>
             <name>Zhongchuan Airport</name>
@@ -3147,13 +3147,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Guangdong</_name>
+        <name>Guangdong</name>
         <fips-code>CH30</fips-code>
         <city>
           <!-- A city in Guangdong in China.
                The name is also written "广州".
             -->
-          <_name>Guangzhou</_name>
+          <name>Guangzhou</name>
           <coordinates>23.116667 113.250000</coordinates>
           <location>
             <name>Guangzhou</name>
@@ -3163,7 +3163,7 @@
         </city>
         <city>
           <!-- A city in Guangdong in China -->
-          <_name>Shantou</_name>
+          <name>Shantou</name>
           <coordinates>23.368140 116.714790</coordinates>
           <location>
             <name>Shantou</name>
@@ -3173,7 +3173,7 @@
         </city>
         <city>
           <!-- A city in Guangdong in China -->
-          <_name>Shenzhen</_name>
+          <name>Shenzhen</name>
           <coordinates>22.533333 114.133333</coordinates>
           <location>
             <name>Shenzhen</name>
@@ -3184,11 +3184,11 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Guangxi</_name>
+        <name>Guangxi</name>
         <fips-code>CH16</fips-code>
         <city>
           <!-- A city in Guangxi in China -->
-          <_name>Guilin</_name>
+          <name>Guilin</name>
           <coordinates>25.281944 110.286389</coordinates>
           <location>
             <name>Guilin</name>
@@ -3200,7 +3200,7 @@
           <!-- A city in Guangxi in China.
                The name is also written "南宁".
             -->
-          <_name>Nanning</_name>
+          <name>Nanning</name>
           <coordinates>22.816667 108.316667</coordinates>
           <location>
             <name>Nanning</name>
@@ -3211,16 +3211,16 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Guizhou</_name>
+        <name>Guizhou</name>
         <fips-code>CH18</fips-code>
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Hainan</_name>
+        <name>Hainan</name>
         <fips-code>CH31</fips-code>
         <city>
           <!-- A city in Hainan in China -->
-          <_name>Sanya</_name>
+          <name>Sanya</name>
           <coordinates>18.243056 109.505000</coordinates>
           <location>
             <name>Fenghuang Airport</name>
@@ -3231,13 +3231,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Heilongjiang</_name>
+        <name>Heilongjiang</name>
         <fips-code>CH08</fips-code>
         <city>
           <!-- A city in Heilongjiang in China.
                The name is also written "哈尔滨".
             -->
-          <_name>Harbin</_name>
+          <name>Harbin</name>
           <coordinates>45.750000 126.650000</coordinates>
           <location>
             <name>Harbin</name>
@@ -3248,13 +3248,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Henan</_name>
+        <name>Henan</name>
         <fips-code>CH09</fips-code>
         <city>
           <!-- A city in Henan in China.
                The name is also written "郑州".
             -->
-          <_name>Zhengzhou</_name>
+          <name>Zhengzhou</name>
           <coordinates>34.757778 113.648611</coordinates>
           <location>
             <name>Zhengzhou</name>
@@ -3265,13 +3265,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Hubei</_name>
+        <name>Hubei</name>
         <fips-code>CH12</fips-code>
         <city>
           <!-- A city in Hubei in China.
                The name is also written "武汉".
             -->
-          <_name>Wuhan</_name>
+          <name>Wuhan</name>
           <coordinates>30.583333 114.266667</coordinates>
           <location>
             <name>Wuhan</name>
@@ -3282,13 +3282,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Hunan</_name>
+        <name>Hunan</name>
         <fips-code>CH11</fips-code>
         <city>
           <!-- A city in Hunan in China.
                The name is also written "长沙".
             -->
-          <_name>Changsha</_name>
+          <name>Changsha</name>
           <coordinates>28.200000 112.966667</coordinates>
           <location>
             <name>Changsha</name>
@@ -3299,13 +3299,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Inner Mongolia</_name>
+        <name>Inner Mongolia</name>
         <fips-code>CH20</fips-code>
         <city>
           <!-- A city in Inner Mongolia in China.
                The name is also written "呼和浩特".
             -->
-          <_name>Hohhot</_name>
+          <name>Hohhot</name>
           <coordinates>40.810556 111.652222</coordinates>
           <location>
             <name>Hohhot</name>
@@ -3316,13 +3316,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Jiangsu</_name>
+        <name>Jiangsu</name>
         <fips-code>CH04</fips-code>
         <city>
           <!-- A city in Jiangsu in China.
                The name is also written "南京".
             -->
-          <_name>Nanjing</_name>
+          <name>Nanjing</name>
           <coordinates>32.061667 118.777778</coordinates>
           <location>
             <name>Nanjing</name>
@@ -3333,13 +3333,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Jilin</_name>
+        <name>Jilin</name>
         <fips-code>CH05</fips-code>
         <city>
           <!-- A city in Jilin in China.
                The name is also written "长春".
             -->
-          <_name>Changchun</_name>
+          <name>Changchun</name>
           <coordinates>43.880000 125.322778</coordinates>
           <location>
             <name>Changchun</name>
@@ -3350,11 +3350,11 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Liaoning</_name>
+        <name>Liaoning</name>
         <fips-code>CH19</fips-code>
         <city>
           <!-- A city in Liaoning in China -->
-          <_name>Dalian</_name>
+          <name>Dalian</name>
           <coordinates>38.912222 121.602222</coordinates>
           <location>
             <name>Dalian</name>
@@ -3366,7 +3366,7 @@
           <!-- A city in Liaoning in China.
                The name is also written "沈阳".
             -->
-          <_name>Shenyang</_name>
+          <name>Shenyang</name>
           <coordinates>41.792222 123.432778</coordinates>
           <location>
             <name>Taokian Airport</name>
@@ -3377,13 +3377,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Shaanxi</_name>
+        <name>Shaanxi</name>
         <fips-code>CH26</fips-code>
         <city>
           <!-- A city in Shaanxi in China.
                The name is also written "西安".
             -->
-          <_name>Xi'an</_name>
+          <name>Xi'an</name>
           <coordinates>34.258333 108.928611</coordinates>
           <location>
             <name>Xi'anyang Airport</name>
@@ -3394,11 +3394,11 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Shandong</_name>
+        <name>Shandong</name>
         <fips-code>CH25</fips-code>
         <city>
           <!-- A city in Shandong in China -->
-          <_name>Qingdao</_name>
+          <name>Qingdao</name>
           <coordinates>36.098611 120.371944</coordinates>
           <location>
             <name>Qingdao</name>
@@ -3409,13 +3409,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name msgctxt="State in China">Shanghai</_name>
+        <name msgctxt="State in China">Shanghai</name>
         <fips-code>CH23</fips-code>
         <city>
           <!-- A city in Shanghai in China.
                The name is also written "上海".
             -->
-          <_name msgctxt="City in Shanghai, China">Shanghai</_name>
+          <name msgctxt="City in Shanghai, China">Shanghai</name>
           <coordinates>31.222222 121.458056</coordinates>
           <location>
             <name>Hongqiao Airport</name>
@@ -3431,13 +3431,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Shanxi</_name>
+        <name>Shanxi</name>
         <fips-code>CH24</fips-code>
         <city>
           <!-- A city in Shanxi in China.
                The name is also written "太原".
             -->
-          <_name>Taiyuan</_name>
+          <name>Taiyuan</name>
           <coordinates>37.869444 112.560278</coordinates>
           <location>
             <name>Taiyuan</name>
@@ -3448,13 +3448,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Sichuan</_name>
+        <name>Sichuan</name>
         <fips-code>CH32</fips-code>
         <city>
           <!-- A city in Sichuan in China.
                The name is also written "成都".
             -->
-          <_name>Chengdu</_name>
+          <name>Chengdu</name>
           <coordinates>30.666667 104.066667</coordinates>
           <location>
             <name>Chengdu</name>
@@ -3465,13 +3465,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name msgctxt="State in China">Tianjin</_name>
+        <name msgctxt="State in China">Tianjin</name>
         <fips-code>CH28</fips-code>
         <city>
           <!-- A city in Tianjin in China.
                The name is also written "天津".
             -->
-          <_name msgctxt="City in Tianjin, China">Tianjin</_name>
+          <name msgctxt="City in Tianjin, China">Tianjin</name>
           <coordinates>39.142222 117.176667</coordinates>
           <location>
             <name>Zhangguizhu Airport</name>
@@ -3482,11 +3482,11 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Xinjiang</_name>
+        <name>Xinjiang</name>
         <fips-code>CH13</fips-code>
         <city>
           <!-- A city in Xinjiang in China -->
-          <_name>Kashi</_name>
+          <name>Kashi</name>
           <coordinates>39.454722 75.979722</coordinates>
           <location>
             <name>Kashi</name>
@@ -3498,7 +3498,7 @@
           <!-- A city in Xinjiang in China.
                The name is also written "乌鲁木齐".
             -->
-          <_name>Urumqi</_name>
+          <name>Urumqi</name>
           <coordinates>43.800000 87.583333</coordinates>
           <location>
             <name>Diwopu Airport</name>
@@ -3509,13 +3509,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Yunnan</_name>
+        <name>Yunnan</name>
         <fips-code>CH29</fips-code>
         <city>
           <!-- A city in Yunnan in China.
                The name is also written "昆明".
             -->
-          <_name>Kunming</_name>
+          <name>Kunming</name>
           <coordinates>25.038889 102.718333</coordinates>
           <location>
             <name>Kunming</name>
@@ -3526,13 +3526,13 @@
       </state>
       <state>
         <!-- A state/province/territory in China -->
-        <_name>Zhejiang</_name>
+        <name>Zhejiang</name>
         <fips-code>CH02</fips-code>
         <city>
           <!-- A city in Zhejiang in China.
                The name is also written "杭州".
             -->
-          <_name>Hangzhou</_name>
+          <name>Hangzhou</name>
           <coordinates>30.255278 120.168889</coordinates>
           <location>
             <name>Hangzhou</name>
@@ -3544,7 +3544,7 @@
     </country>
     <country>
       <!-- GE - Georgia (the country, not the US state) -->
-      <_name msgctxt="Country">Georgia</_name>
+      <name msgctxt="Country">Georgia</name>
       <iso-code>GE</iso-code>
       <fips-code>GG</fips-code>
       <timezones>
@@ -3570,7 +3570,7 @@
       <!-- HK - Hong Kong, aka "Hong Kong Special Administrative Region
            of China"
         -->
-      <_name>Hong Kong</_name>
+      <name>Hong Kong</name>
       <iso-code>HK</iso-code>
       <fips-code>HK</fips-code>
       <timezones>
@@ -3579,7 +3579,7 @@
       <tz-hint>Asia/Hong_Kong</tz-hint>
       <city>
         <!-- A city in Hong Kong -->
-        <_name>Kowloon</_name>
+        <name>Kowloon</name>
         <coordinates>22.316667 114.183333</coordinates>
         <location>
           <name>Hong Kong International Airport</name>
@@ -3590,7 +3590,7 @@
     </country>
     <country>
       <!-- IN - India -->
-      <_name>India</_name>
+      <name>India</name>
       <!-- Could not find information about the following stations,
            which may be in India:
            VOBL VOHS 
@@ -3613,7 +3613,7 @@
       <city>
         <!-- A city in India
              the local name in Bengali is "আগরতলা/Agortôla"-->
-        <_name>Agartala</_name>
+        <name>Agartala</name>
         <coordinates>23.50000 91.20000</coordinates>
         <location>
           <name>Agartala Airport</name>
@@ -3625,7 +3625,7 @@
         <!-- A city in India
              the local name in Hindi is "आगरा"
 	     -->
-        <_name>Agra</_name>
+        <name>Agra</name>
         <coordinates>27.18000 78.02000</coordinates>
         <location>
           <name>Agra Air Force Station</name>
@@ -3635,7 +3635,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Ahmadabad</_name>
+        <name>Ahmadabad</name>
         <coordinates>23.033333 72.616667</coordinates>
         <location>
           <name>Ahmadabad</name>
@@ -3646,7 +3646,7 @@
       <city>
         <!-- A city in India
 	     the local name in Hindi is "इलाहाबाद"-->
-        <_name>Allahabad</_name>
+        <name>Allahabad</name>
         <coordinates>25.45000 81.85000</coordinates>
         <location>
           <name>Allahabad Airport</name>
@@ -3658,7 +3658,7 @@
         <!-- A city in India
 	      the local name in Punjabi is "ਅੰਮ੍ਰਿਤਸਰ"
               -->
-        <_name>Amritsar</_name>
+        <name>Amritsar</name>
         <coordinates>31.633056 74.865556</coordinates>
         <location>
           <name>Raja Sansi International Airport</name>
@@ -3669,7 +3669,7 @@
       <city>
         <!-- A city in India
 	     the local name in Marathi is "औरंगाबाद"-->
-        <_name>Aurangabad</_name>
+        <name>Aurangabad</name>
         <coordinates>19.78000 75.29000</coordinates>
         <location>
           <name>Chikkalthan Airport</name>
@@ -3679,7 +3679,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Bagdogra</_name>
+        <name>Bagdogra</name>
         <coordinates>26.68000 88.33000</coordinates>
         <location>
           <name>Bagdogra Airport</name>
@@ -3691,7 +3691,7 @@
         <!-- A city in India - local airport
              "Bengaluru" is the new name
 	  -->
-	<_name>Bangalore</_name>
+	<name>Bangalore</name>
 	<coordinates>12.966666 77.566666</coordinates>
 	<location>
 	  <name>Bangalore Airport/Bengaluru Airport</name>
@@ -3708,7 +3708,7 @@
         <!-- A city in India 
 	     the local name in Gujrati is "ભાવનગર"
 	     the local name in Hindi is "भावनगर"-->
-        <_name>Bhavnagar</_name>
+        <name>Bhavnagar</name>
         <coordinates>21.76000 72.15000</coordinates>
         <location>
           <name>Bhavnagar Airport</name>
@@ -3722,7 +3722,7 @@
              The local name is "Varanasi".
              The local name in Hindi is "वाराणसी".
           -->
-        <_name>Benares</_name>
+        <name>Benares</name>
         <coordinates>25.333333 83.000000</coordinates>
         <location>
           <name>Benares / Babatpur</name>
@@ -3734,7 +3734,7 @@
         <!-- A city in India.
              The local name in Hindi is "भोपाल".
           -->
-        <_name>Bhopal</_name>
+        <name>Bhopal</name>
         <coordinates>23.25000 77.42000</coordinates>
         <location>
           <name>Raja Bhoj Airport</name>
@@ -3746,7 +3746,7 @@
         <!-- A city in India.
              The local name in Oriya is "ଭୁବେନଶ୍ବର".
           -->
-        <_name>Bhubaneshwar</_name>
+        <name>Bhubaneshwar</name>
         <coordinates>20.27000 85.84000</coordinates>
         <location>
           <name>Biju Patnaik Airport</name>
@@ -3756,7 +3756,7 @@
       </city>
       <city>
         <!-- A city in India.-->
-        <_name>Bhuj</_name>
+        <name>Bhuj</name>
         <coordinates>23.27000 69.67000</coordinates>
         <location>
           <name>Bhuj Airport</name>
@@ -3768,7 +3768,7 @@
       <!-- A union territory in India.
 	    The local name in Hindi is "चण्डीगढ़ / चंडीगढ़"
 	    The local name in Punjabi is "ਚੰਡੀਗੜ੍ਹ"-->
-      <_name>Chandigarh</_name>
+      <name>Chandigarh</name>
       <coordinates>30.75000 76.78000</coordinates>
       <location>
 	<name>Chandigarh Airport</name>
@@ -3781,7 +3781,7 @@
              "Madras" is the traditional English name.
              The local name in Tamil is "Chennai / சென்னை".
           -->
-        <_name>Chennai</_name>
+        <name>Chennai</name>
         <coordinates>13.083333 80.283333</coordinates>
         <location>
           <name>Madras / Minambakkam</name>
@@ -3793,7 +3793,7 @@
         <!-- A city in India.
              The local name in Tamil is "கோயம்புத்தூர்".
           -->
-        <_name>Coimbatore</_name>
+        <name>Coimbatore</name>
         <coordinates>11.018333 76.97250</coordinates>
         <location>
           <name>Peelamedu Airport</name>
@@ -3805,7 +3805,7 @@
         <!-- A city in India
 	     also known as Dehra Doon
 	     the local name in Hindi is "देहरादून"-->
-        <_name>Dehradun</_name>
+        <name>Dehradun</name>
         <coordinates>30.33000 78.06000</coordinates>
         <location>
           <name>Jolly Grant Airport</name>
@@ -3815,7 +3815,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Dibrugarh</_name>
+        <name>Dibrugarh</name>
         <coordinates>27.48000 94.90000</coordinates>
         <location>
           <name>Mohanbari Airport</name>
@@ -3826,7 +3826,7 @@
       <city>
         <!-- A city in India
 	     the local name in Hindi is "दीमापुर"-->
-        <_name>Dimapur</_name>
+        <name>Dimapur</name>
         <coordinates>25.92000 93.73000</coordinates>
         <location>
           <name>Dimapur Airport</name>
@@ -3836,7 +3836,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Hyderabad</_name>
+        <name>Hyderabad</name>
         <coordinates>17.375278 78.474444</coordinates>
         <location>
           <name>Hyderabad Airport</name>
@@ -3846,7 +3846,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Jaipur</_name>
+        <name>Jaipur</name>
         <coordinates>26.916667 75.816667</coordinates>
         <location>
           <name>Jaipur / Sanganer</name>
@@ -3857,7 +3857,7 @@
       <city>
       <!-- A city in India. 
 	   The local name in Dogri is "जम्मू" -->
-      <_name>Jammu</_name>
+      <name>Jammu</name>
       <coordinates>32.73000 74.87000</coordinates>
       <location>
 	<name>Jammu Airport</name>
@@ -3868,7 +3868,7 @@
       <city>
         <!-- A city in India.
              The old name is "Cochin" -->
-        <_name>Kochi</_name>
+        <name>Kochi</name>
         <coordinates>9.977000 76.27000</coordinates>
         <location>
           <name>Cochin International Airport</name>
@@ -3881,7 +3881,7 @@
              "Calcutta" is the traditional English name.
              The local name in Bengali is "Kolkata /  কলকাতা".
           -->
-        <_name>Kolkata</_name>
+        <name>Kolkata</name>
         <coordinates>22.569722 88.369722</coordinates>
         <location>
           <name>Calcutta / Dam Dam</name>
@@ -3892,7 +3892,7 @@
      <city>
      <!-- A city in India. 
           The local name in Hindi is "लेह" -->
-     <_name>Leh</_name>
+     <name>Leh</name>
      <coordinates>34.17000 77.58000</coordinates>
      <location>
        <name>Leh Kushok Bakula Rimpochee Airport</name>
@@ -3904,7 +3904,7 @@
        <!-- A city in India.
              The local name in Hindi is "लखनऊ".
           -->
-        <_name>Lucknow</_name>
+        <name>Lucknow</name>
         <coordinates>26.850000 80.916667</coordinates>
         <location>
           <name>Lucknow / Amausi</name>
@@ -3917,7 +3917,7 @@
              "Bombay" is the traditional English name.
              The local name in Marathi is "Mumbai /  मुंबई".
           -->
-        <_name>Mumbai</_name>
+        <name>Mumbai</name>
         <coordinates>18.975000 72.825833</coordinates>
         <location>
           <name>Bombay / Santa Cruz</name>
@@ -3927,7 +3927,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Nagpur</_name>
+        <name>Nagpur</name>
         <coordinates>21.150000 79.100000</coordinates>
         <location>
           <name>Nagpur Sonegaon</name>
@@ -3941,7 +3941,7 @@
              The local name in Panjabi is "ਨਵੀਂ ਦਿੱਲੀ".
              The local name in Hindi is "नई दिल्ली".
           -->
-        <_name>New Delhi</_name>
+        <name>New Delhi</name>
         <coordinates>28.600000 77.200000</coordinates>
         <location>
           <name>New Delhi / Palam</name>
@@ -3951,7 +3951,7 @@
       </city>
       <city>
         <!-- A city in India -->
-        <_name>Patna</_name>
+        <name>Patna</name>
         <coordinates>25.600000 85.116667</coordinates>
         <location>
           <name>Patna</name>
@@ -3961,7 +3961,7 @@
       </city>
       <city>
       <!-- A city in India -->
-        <_name>Pune</_name>
+        <name>Pune</name>
         <coordinates>18.53 73.85</coordinates>
         <location>
           <name>Pune International Airport</name>
@@ -3972,7 +3972,7 @@
       <city>
       <!-- A city in India.
            The local name in Hindi is "शिमला" -->
-        <_name>Shimla</_name>
+        <name>Shimla</name>
         <coordinates>31.11100 77.15400</coordinates>
         <location>
           <name>Shimla Airport</name>
@@ -3984,7 +3984,7 @@
       <!-- A city in India.
            The local name in Dogri is "श्रीनगर"
            The local name in Urdu is "شرینگر"-->
-        <_name>Srinagar</_name>
+        <name>Srinagar</name>
         <coordinates>34.09000 74.79000</coordinates>
         <location>
           <name>Srinagar Airport</name>
@@ -3996,7 +3996,7 @@
         <!-- A city in India.
              The local name in Malayalam is "തിരുവനന്തപുരം".
           -->
-        <_name>Thiruvananthapuram</_name>
+        <name>Thiruvananthapuram</name>
         <coordinates>8.506944 76.956944</coordinates>
         <location>
           <name>Thiruvananthapuram</name>
@@ -4008,7 +4008,7 @@
         <!-- A city in India.
              The local name in Tamil is "திருச்சிராப்பள்ளி".
           -->
-        <_name>Tiruchchirappalli</_name>
+        <name>Tiruchchirappalli</name>
         <coordinates>10.805000 78.685556</coordinates>
         <location>
           <name>Tiruchchirapalli</name>
@@ -4019,7 +4019,7 @@
     </country>
     <country>
       <!-- ID - Indonesia -->
-      <_name>Indonesia</_name>
+      <name>Indonesia</name>
       <!-- Could not find information about the following stations,
            which may be in Indonesia:
            WADD WALL WARR WARS WIDD WIPT
@@ -4031,26 +4031,26 @@
           <!-- The timezone on the western islands of Indonesia. The
                name in Indonesian is "Waktu Indonesia Bagian Barat".
             -->
-          <_name>Western Indonesia Time</_name>
+          <name>Western Indonesia Time</name>
           <obsoletes>Asia/Pontianak</obsoletes>
         </timezone>
         <timezone id="Asia/Makassar">
           <!-- The timezone on the central islands of Indonesia. The
                name in Indonesian is "Waktu Indonesia Bagian Tengah".
             -->
-          <_name>Central Indonesia Time</_name>
+          <name>Central Indonesia Time</name>
         </timezone>
         <timezone id="Asia/Jayapura">
           <!-- The timezone on the eastern islands of Indonesia. The
                name in Indonesian is "Waktu Indonesia Bagian Timur".
             -->
-          <_name>Eastern Indonesia Time</_name>
+          <name>Eastern Indonesia Time</name>
         </timezone>
       </timezones>
       <tz-hint>Asia/Jakarta</tz-hint>
       <city>
         <!-- The capital of Indonesia -->
-        <_name>Jakarta</_name>
+        <name>Jakarta</name>
         <coordinates>-6.174444 106.829444</coordinates>
         <location>
           <name>Soekarno-Hatta Airport</name>
@@ -4060,7 +4060,7 @@
       </city>
       <city>
         <!-- A city in Indonesia -->
-        <_name>Makassar</_name>
+        <name>Makassar</name>
         <coordinates>-5.140000 119.422100</coordinates>
         <location>
           <name>Hasanuddin Airport</name>
@@ -4071,7 +4071,7 @@
       </city>
       <city>
         <!-- A city in Indonesia -->
-        <_name>Medan</_name>
+        <name>Medan</name>
         <coordinates>3.583333 98.666667</coordinates>
         <location>
           <name>Polonia Airport</name>
@@ -4081,7 +4081,7 @@
       </city>
       <city>
         <!-- A city in Indonesia -->
-        <_name>Palembang</_name>
+        <name>Palembang</name>
         <coordinates>-2.916667 104.750000</coordinates>
         <location>
           <name>Talangbetutu Airport</name>
@@ -4091,7 +4091,7 @@
       </city>
       <city>
         <!-- A city in Indonesia -->
-        <_name>Pekanbaru</_name>
+        <name>Pekanbaru</name>
         <coordinates>0.533333 101.450000</coordinates>
         <location>
           <name>Simpangtiga Airport</name>
@@ -4101,7 +4101,7 @@
       </city>
       <city>
         <!-- A city in Indonesia -->
-        <_name>Yogyakarta</_name>
+        <name>Yogyakarta</name>
         <coordinates>-7.803164 110.3398254</coordinates>
         <location>
           <name>Adisucipto International Airport</name>
@@ -4112,7 +4112,7 @@
     </country>
     <country>
       <!-- JP - Japan -->
-      <_name>Japan</_name>
+      <name>Japan</name>
       <!-- Could not find information about the following stations,
            which may be in Japan:
            RJBE RJNW 
@@ -4125,7 +4125,7 @@
       <tz-hint>Asia/Tokyo</tz-hint>
       <city>
         <!-- A city in Japan -->
-        <_name>Akita</_name>
+        <name>Akita</name>
         <coordinates>39.716667 140.066667</coordinates>
         <location>
           <name>Akita Airport</name>
@@ -4135,7 +4135,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ami</_name>
+        <name>Ami</name>
         <coordinates>36.033333 140.200000</coordinates>
         <location>
           <name>Kasumigaura Air Base</name>
@@ -4145,7 +4145,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Aomori</_name>
+        <name>Aomori</name>
         <coordinates>40.821111 140.751111</coordinates>
         <location>
           <name>Aomori Airport</name>
@@ -4155,7 +4155,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Asahikawa</_name>
+        <name>Asahikawa</name>
         <coordinates>43.767778 142.370278</coordinates>
         <location>
           <name>Asahikawa Airport</name>
@@ -4165,7 +4165,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ashiya</_name>
+        <name>Ashiya</name>
         <coordinates>33.883333 130.666667</coordinates>
         <location>
           <name>Ashiya Air Base</name>
@@ -4175,7 +4175,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Chitose</_name>
+        <name>Chitose</name>
         <coordinates>42.819444 141.652222</coordinates>
         <location>
           <name>Chitose Air Base</name>
@@ -4190,7 +4190,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Chofu</_name>
+        <name>Chofu</name>
         <coordinates>35.655556 139.552222</coordinates>
         <location>
           <name>Chofu Airport</name>
@@ -4200,7 +4200,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Fuji</_name>
+        <name>Fuji</name>
         <coordinates>35.166667 138.683333</coordinates>
         <location>
           <name>Fuji Air Base</name>
@@ -4210,7 +4210,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Fukue</_name>
+        <name>Fukue</name>
         <coordinates>32.688056 128.841944</coordinates>
         <location>
           <name>Fukue Airport</name>
@@ -4220,7 +4220,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Fukuoka</_name>
+        <name>Fukuoka</name>
         <coordinates>33.583333 130.400000</coordinates>
         <location>
           <name>Fukuoka Airport</name>
@@ -4230,7 +4230,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Futemma</_name>
+        <name>Futemma</name>
         <coordinates>26.287222 127.773056</coordinates>
         <location>
           <name>Futenma Marine Corps Air Facility</name>
@@ -4240,7 +4240,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Gifu</_name>
+        <name>Gifu</name>
         <coordinates>35.416667 136.750000</coordinates>
         <location>
           <name>Gifu Air Base</name>
@@ -4250,7 +4250,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hakodate</_name>
+        <name>Hakodate</name>
         <coordinates>41.775833 140.736667</coordinates>
         <location>
           <name>Hakodate Airport</name>
@@ -4260,7 +4260,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hamamatsu</_name>
+        <name>Hamamatsu</name>
         <coordinates>34.700000 137.733333</coordinates>
         <location>
           <name>Hamamatsu Air Base</name>
@@ -4270,7 +4270,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hamanaka</_name>
+        <name>Hamanaka</name>
         <coordinates>38.816667 139.783333</coordinates>
         <location>
           <name>Shonai</name>
@@ -4280,7 +4280,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hanamaki</_name>
+        <name>Hanamaki</name>
         <coordinates>39.383333 141.116667</coordinates>
         <location>
           <name>Hanamaki Airport</name>
@@ -4290,7 +4290,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hiroshima</_name>
+        <name>Hiroshima</name>
         <coordinates>34.400000 132.450000</coordinates>
         <location>
           <name>Hiroshimanishi</name>
@@ -4305,7 +4305,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Hofu</_name>
+        <name>Hofu</name>
         <coordinates>34.050000 131.566667</coordinates>
         <location>
           <name>Hofu Air Base</name>
@@ -4315,7 +4315,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ishigaki</_name>
+        <name>Ishigaki</name>
         <coordinates>24.333333 124.150000</coordinates>
         <location>
           <name>Ishigakijima</name>
@@ -4325,7 +4325,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Iwakuni</_name>
+        <name>Iwakuni</name>
         <coordinates>34.150000 132.183333</coordinates>
         <location>
           <name>Iwakuni Marine Corps Air Station</name>
@@ -4335,7 +4335,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Izumo</_name>
+        <name>Izumo</name>
         <coordinates>35.366667 132.766667</coordinates>
         <location>
           <name>Izumo Airport</name>
@@ -4345,7 +4345,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Janado</_name>
+        <name>Janado</name>
         <coordinates>26.333333 126.800000</coordinates>
         <location>
           <name>Kumejima</name>
@@ -4355,7 +4355,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kadena</_name>
+        <name>Kadena</name>
         <coordinates>26.366667 127.750000</coordinates>
         <location>
           <name>Kadena Air Base</name>
@@ -4365,7 +4365,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kagoshima</_name>
+        <name>Kagoshima</name>
         <coordinates>31.600000 130.550000</coordinates>
         <location>
           <name>Kagoshima Airport</name>
@@ -4375,7 +4375,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kanayama</_name>
+        <name>Kanayama</name>
         <coordinates>33.683333 135.350000</coordinates>
         <location>
           <name>Nankishirahama Airport</name>
@@ -4385,7 +4385,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kanoya</_name>
+        <name>Kanoya</name>
         <coordinates>31.383333 130.850000</coordinates>
         <location>
           <name>Kanoya Air Base</name>
@@ -4395,7 +4395,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kashoji</_name>
+        <name>Kashoji</name>
         <coordinates>34.400000 135.283333</coordinates>
         <location>
           <name>Kansai International Airport</name>
@@ -4405,7 +4405,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kitakyushu</_name>
+        <name>Kitakyushu</name>
         <coordinates>33.833333 130.833333</coordinates>
         <location>
           <name>Kitakyushu Airport</name>
@@ -4415,7 +4415,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kochi</_name>
+        <name>Kochi</name>
         <coordinates>33.550000 133.550000</coordinates>
         <location>
           <name>Kochi Airport</name>
@@ -4425,7 +4425,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Komatsu</_name>
+        <name>Komatsu</name>
         <coordinates>36.400000 136.450000</coordinates>
         <location>
           <name>Komatsu Air Base</name>
@@ -4435,7 +4435,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Komatsushima</_name>
+        <name>Komatsushima</name>
         <coordinates>34.000000 134.583333</coordinates>
         <location>
           <name>Komatsujima Air Base</name>
@@ -4445,7 +4445,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kumamoto</_name>
+        <name>Kumamoto</name>
         <coordinates>32.800000 130.716667</coordinates>
         <location>
           <name>Kumamoto Airport</name>
@@ -4455,7 +4455,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Kushiro</_name>
+        <name>Kushiro</name>
         <coordinates>42.975000 144.374722</coordinates>
         <location>
           <name>Kushiro Airport</name>
@@ -4465,7 +4465,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Matsubara</_name>
+        <name>Matsubara</name>
         <coordinates>24.783333 125.266667</coordinates>
         <location>
           <name>Miyakojima</name>
@@ -4475,7 +4475,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Matsumoto</_name>
+        <name>Matsumoto</name>
         <coordinates>36.233333 137.966667</coordinates>
         <location>
           <name>Matsumoto Airport</name>
@@ -4485,7 +4485,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Matsushima</_name>
+        <name>Matsushima</name>
         <coordinates>38.366667 141.071667</coordinates>
         <location>
           <name>Matsushima Air Base</name>
@@ -4495,7 +4495,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Matsuyama</_name>
+        <name>Matsuyama</name>
         <coordinates>33.836389 132.753056</coordinates>
         <location>
           <name>Matsuyama Airport</name>
@@ -4505,7 +4505,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Memambetsu</_name>
+        <name>Memambetsu</name>
         <coordinates>43.907222 144.173889</coordinates>
         <location>
           <name>Memambetsu Airport</name>
@@ -4515,7 +4515,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Mihonoseki</_name>
+        <name>Mihonoseki</name>
         <coordinates>35.566667 133.316667</coordinates>
         <location>
           <name>Miho Air Base</name>
@@ -4525,7 +4525,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Minami</_name>
+        <name>Minami</name>
         <coordinates>24.783333 141.316667</coordinates>
         <location>
           <name>Iwojima</name>
@@ -4535,7 +4535,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Misawa</_name>
+        <name>Misawa</name>
         <coordinates>40.683611 141.359722</coordinates>
         <location>
           <name>Misawa Air Base</name>
@@ -4545,7 +4545,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Mito</_name>
+        <name>Mito</name>
         <coordinates>36.366667 140.466667</coordinates>
         <location>
           <name>Hyakuri Air Base</name>
@@ -4555,7 +4555,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Miyazaki</_name>
+        <name>Miyazaki</name>
         <coordinates>31.900000 131.433333</coordinates>
         <location>
           <name>Miyazaki Airport</name>
@@ -4565,7 +4565,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Mombetsu</_name>
+        <name>Mombetsu</name>
         <coordinates>44.352500 143.352500</coordinates>
         <location>
           <name>Mombetsu Airport</name>
@@ -4575,7 +4575,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Nagasaki</_name>
+        <name>Nagasaki</name>
         <coordinates>32.755000 129.868333</coordinates>
         <location>
           <name>Nagasaki Airport</name>
@@ -4585,7 +4585,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Nagoya</_name>
+        <name>Nagoya</name>
         <coordinates>35.166667 136.916667</coordinates>
         <location>
           <name>Nagoya Airport</name>
@@ -4595,7 +4595,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Naha</_name>
+        <name>Naha</name>
         <coordinates>26.207222 127.673333</coordinates>
         <location>
           <name>Naha Airport</name>
@@ -4605,7 +4605,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Naka-shibetsu</_name>
+        <name>Naka-shibetsu</name>
         <coordinates>43.550000 144.983333</coordinates>
         <location>
           <name>Naka-shibetsu Airport</name>
@@ -4615,7 +4615,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Niigata</_name>
+        <name>Niigata</name>
         <coordinates>37.916667 139.050000</coordinates>
         <location>
           <name>Niigata Airport</name>
@@ -4625,7 +4625,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Obihiro</_name>
+        <name>Obihiro</name>
         <coordinates>42.917222 143.204444</coordinates>
         <location>
           <name>Tokachi Japanese Ground Self Defense Force</name>
@@ -4640,7 +4640,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Odaira</_name>
+        <name>Odaira</name>
         <coordinates>30.550000 130.966667</coordinates>
         <location>
           <name>Tanegashima Airport</name>
@@ -4650,7 +4650,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Odaka</_name>
+        <name>Odaka</name>
         <coordinates>37.200000 140.416667</coordinates>
         <location>
           <name>Fukushima Airport</name>
@@ -4660,7 +4660,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Odate</_name>
+        <name>Odate</name>
         <coordinates>40.268611 140.568333</coordinates>
         <location>
           <name>Odate-Noshiro Airport</name>
@@ -4670,7 +4670,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ofunakoshi</_name>
+        <name>Ofunakoshi</name>
         <coordinates>34.273333 129.354722</coordinates>
         <location>
           <name>Tsushima Airport</name>
@@ -4680,7 +4680,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ogimachiya</_name>
+        <name>Ogimachiya</name>
         <coordinates>35.833333 139.400000</coordinates>
         <location>
           <name>Iruma Air Base</name>
@@ -4690,7 +4690,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Oita</_name>
+        <name>Oita</name>
         <coordinates>33.237222 131.604444</coordinates>
         <location>
           <name>Oita Airport</name>
@@ -4700,7 +4700,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Okata</_name>
+        <name>Okata</name>
         <coordinates>34.783333 139.383333</coordinates>
         <location>
           <name>Oshima Airport</name>
@@ -4710,7 +4710,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Okayama</_name>
+        <name>Okayama</name>
         <coordinates>34.650000 133.916667</coordinates>
         <location>
           <name>Okayama Airport</name>
@@ -4720,7 +4720,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Okazato</_name>
+        <name>Okazato</name>
         <coordinates>33.100000 139.783333</coordinates>
         <location>
           <name>Hachijojima Airport</name>
@@ -4730,7 +4730,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Osaka</_name>
+        <name>Osaka</name>
         <coordinates>34.666667 135.500000</coordinates>
         <location>
           <name>Osaka International Airport</name>
@@ -4740,7 +4740,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ozuki</_name>
+        <name>Ozuki</name>
         <coordinates>34.066667 131.033333</coordinates>
         <location>
           <name>Ozuki Air Base</name>
@@ -4750,7 +4750,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Saga</_name>
+        <name>Saga</name>
         <coordinates>33.250000 130.300000</coordinates>
         <location>
           <name>Saga Airport</name>
@@ -4760,7 +4760,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Sanrizuka</_name>
+        <name>Sanrizuka</name>
         <coordinates>35.750000 140.383333</coordinates>
         <location>
           <name>New Tokyo International Airport</name>
@@ -4770,7 +4770,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Sawada</_name>
+        <name>Sawada</name>
         <coordinates>24.833333 125.166667</coordinates>
         <location>
           <name>Shimoji-Shima Island</name>
@@ -4780,7 +4780,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Sendai</_name>
+        <name>Sendai</name>
         <coordinates>38.254722 140.884722</coordinates>
         <location>
           <name>Kasuminome Air Base</name>
@@ -4795,7 +4795,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Shiroi</_name>
+        <name>Shiroi</name>
         <coordinates>35.800000 140.066667</coordinates>
         <location>
           <name>Shimofusa Air Base</name>
@@ -4805,7 +4805,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Takamatsu</_name>
+        <name>Takamatsu</name>
         <coordinates>34.333333 134.050000</coordinates>
         <location>
           <name>Takamatsu Airport</name>
@@ -4815,7 +4815,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Takatsu</_name>
+        <name>Takatsu</name>
         <coordinates>34.683333 131.783333</coordinates>
         <location>
           <name>Iwami Airport</name>
@@ -4825,7 +4825,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Tateyama</_name>
+        <name>Tateyama</name>
         <coordinates>34.983333 139.866667</coordinates>
         <location>
           <name>Tateyama Air Base</name>
@@ -4835,7 +4835,7 @@
       </city>
       <city>
         <!-- The capital of Japan -->
-        <_name>Tokyo</_name>
+        <name>Tokyo</name>
         <coordinates>35.685000 139.751389</coordinates>
         <location>
           <name>Tokyo Heliport</name>
@@ -4850,7 +4850,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Tottori</_name>
+        <name>Tottori</name>
         <coordinates>35.500000 134.233333</coordinates>
         <location>
           <name>Tottori Airport</name>
@@ -4860,7 +4860,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Toyama</_name>
+        <name>Toyama</name>
         <coordinates>36.683333 137.216667</coordinates>
         <location>
           <name>Toyama Airport</name>
@@ -4870,7 +4870,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Toyooka</_name>
+        <name>Toyooka</name>
         <coordinates>35.533333 134.833333</coordinates>
         <location>
           <name>Tajima</name>
@@ -4880,7 +4880,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Tsuiki</_name>
+        <name>Tsuiki</name>
         <coordinates>33.666667 131.050000</coordinates>
         <location>
           <name>Tsuiki Air Base</name>
@@ -4890,7 +4890,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Ushuku</_name>
+        <name>Ushuku</name>
         <coordinates>28.450000 129.716667</coordinates>
         <location>
           <name>Amami Airport</name>
@@ -4900,7 +4900,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Wakkanai</_name>
+        <name>Wakkanai</name>
         <coordinates>45.409444 141.673889</coordinates>
         <location>
           <name>Wakkanai Airport</name>
@@ -4910,7 +4910,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Yamagata</_name>
+        <name>Yamagata</name>
         <coordinates>38.252778 140.337500</coordinates>
         <location>
           <name>Yamagata Airport</name>
@@ -4920,7 +4920,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Yamaguchi</_name>
+        <name>Yamaguchi</name>
         <coordinates>34.166667 131.483333</coordinates>
         <location>
           <name>Yamaguchi Ube Airport</name>
@@ -4930,7 +4930,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Yao</_name>
+        <name>Yao</name>
         <coordinates>34.616667 135.600000</coordinates>
         <location>
           <name>Yao Airport</name>
@@ -4940,7 +4940,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Yokota</_name>
+        <name>Yokota</name>
         <coordinates>35.750000 139.383333</coordinates>
         <location>
           <name>Yokota Air Base</name>
@@ -4950,7 +4950,7 @@
       </city>
       <city>
         <!-- A city in Japan -->
-        <_name>Yoshinaga</_name>
+        <name>Yoshinaga</name>
         <coordinates>34.800000 138.300000</coordinates>
         <location>
           <name>Shizuhama Air Base</name>
@@ -4961,7 +4961,7 @@
     </country>
     <country>
       <!-- KZ - Kazakhstan -->
-      <_name>Kazakhstan</_name>
+      <name>Kazakhstan</name>
       <iso-code>KZ</iso-code>
       <fips-code>KZ</fips-code>
       <pref-lang>kaz</pref-lang>
@@ -4970,14 +4970,14 @@
           <!-- The time zone used in the eastern half of Kazakhstan.
                FIXME: is there an official name for this zone?
             -->
-          <_name>Eastern Kazakhstan</_name>
+          <name>Eastern Kazakhstan</name>
           <obsoletes>Asia/Qyzylorda</obsoletes>
         </timezone>
         <timezone id="Asia/Aqtobe">
           <!-- The time zone used in the western half of Kazakhstan.
                FIXME: is there an official name for this zone?
             -->
-          <_name>Western Kazakhstan</_name>
+          <name>Western Kazakhstan</name>
           <obsoletes>Asia/Aqtau</obsoletes>
           <obsoletes>Asia/Oral</obsoletes>
         </timezone>
@@ -4985,7 +4985,7 @@
       <tz-hint>Asia/Almaty</tz-hint>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Almaty</_name>
+        <name>Almaty</name>
         <coordinates>43.250000 76.950000</coordinates>
         <location>
           <name>Almaty</name>
@@ -4995,7 +4995,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Aktau</_name>
+        <name>Aktau</name>
         <coordinates>43.650000 51.200000</coordinates>
         <location>
           <name>Aktau</name>
@@ -5006,7 +5006,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Aktobe</_name>
+        <name>Aktobe</name>
         <coordinates>50.298056 57.181389</coordinates>
         <location>
           <name>Aktobe</name>
@@ -5017,7 +5017,7 @@
       </city>
       <city>
         <!-- The capital of Kazakhstan -->
-        <_name>Astana</_name>
+        <name>Astana</name>
         <coordinates>51.181111 71.427778</coordinates>
         <location>
           <name>Astana</name>
@@ -5027,7 +5027,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Atyrau</_name>
+        <name>Atyrau</name>
         <coordinates>47.105000 51.920000</coordinates>
         <location>
           <name>Atyrau Airport</name>
@@ -5040,7 +5040,7 @@
         <!-- A city in Kazakhstan.
              The local name in Russian is "Balkhash". 
           -->
-        <_name>Balqash</_name>
+        <name>Balqash</name>
         <coordinates>46.840000 74.975000</coordinates>
         <location>
           <name>Balqash Airport</name>
@@ -5050,7 +5050,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Karaganda</_name>
+        <name>Karaganda</name>
         <coordinates>49.798889 73.099444</coordinates>
         <location>
           <name>Karaganda</name>
@@ -5060,7 +5060,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Kokshetau</_name>
+        <name>Kokshetau</name>
         <coordinates>53.275000 69.390000</coordinates>
         <location>
           <name>Kokshetau Airport</name>
@@ -5070,7 +5070,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Kostanay</_name>
+        <name>Kostanay</name>
         <coordinates>53.166667 63.583333</coordinates>
         <location>
           <name>Kostanay</name>
@@ -5080,7 +5080,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Kyzylorda</_name>
+        <name>Kyzylorda</name>
         <coordinates>44.852778 65.509167</coordinates>
         <location>
           <name>Kyzylorda</name>
@@ -5092,7 +5092,7 @@
         <!-- A city in Kazakhstan.
              The local name in Russian is "Ural'sk".
           -->
-        <_name>Oral</_name>
+        <name>Oral</name>
         <coordinates>51.233333 51.366667</coordinates>
         <location>
           <name>Oral</name>
@@ -5104,7 +5104,7 @@
       <city>
         <!-- A city in Kazakhstan.
           -->
-        <_name>Oskemen</_name>
+        <name>Oskemen</name>
         <coordinates>49.960000 82.606000</coordinates>
         <location>
           <name>Oskemen Airport</name>
@@ -5116,7 +5116,7 @@
         <!-- A city in Kazakhstan.
              The local name in Russian is "Petropavlovsk".
           -->
-        <_name>Petropavl</_name>
+        <name>Petropavl</name>
         <coordinates>54.864427 69.133755</coordinates>
         <location>
           <name>Petropavl Airport</name>
@@ -5126,7 +5126,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Pavlodar</_name>
+        <name>Pavlodar</name>
         <coordinates>52.264656, 76.970022</coordinates>
         <location>
           <name>Pavlodar Airport</name>
@@ -5136,7 +5136,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Semey</_name>
+        <name>Semey</name>
         <coordinates>50.413720 80.233534</coordinates>
         <location>
           <name>Semey Airport</name>
@@ -5146,7 +5146,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Shymkent</_name>
+        <name>Shymkent</name>
         <coordinates>42.300000 69.600000</coordinates>
         <location>
           <name>Shymkent</name>
@@ -5156,7 +5156,7 @@
       </city>
       <city>
         <!-- A city in Kazakhstan -->
-        <_name>Taraz</_name>
+        <name>Taraz</name>
         <coordinates>42.901070 71.378531</coordinates>
         <location>
           <name>Taraz Airport</name>
@@ -5167,7 +5167,7 @@
     </country>
     <country>
       <!-- KG - Kyrgyzstan -->
-      <_name>Kyrgyzstan</_name>
+      <name>Kyrgyzstan</name>
       <!-- Could not find information about the following stations,
            which may be in Kyrgyzstan:
            UAFO 
@@ -5180,7 +5180,7 @@
       <tz-hint>Asia/Bishkek</tz-hint>
       <city>
         <!-- The capital of Kyrgyzstan -->
-        <_name>Bishkek</_name>
+        <name>Bishkek</name>
         <coordinates>42.873056 74.600278</coordinates>
         <location>
           <name>Manas Airport</name>
@@ -5191,7 +5191,7 @@
     </country>
     <country>
       <!-- LA - Lao People's Democratic Republic -->
-      <_name>Laos</_name>
+      <name>Laos</name>
       <!-- Could not find weather stations for the following major
            cities:
            Muang Phonsavan
@@ -5207,7 +5207,7 @@
              "Vientiane" is the traditional English name.
              The local name in Lao is "Viangchan".
           -->
-        <_name>Vientiane</_name>
+        <name>Vientiane</name>
         <coordinates>17.966667 102.600000</coordinates>
         <location>
           <name>Vientiane</name>
@@ -5222,7 +5222,7 @@
            used. The "u" spelling is currently slightly more popular in
            English.)
         -->
-      <_name msgctxt="Country">Macau</_name>
+      <name msgctxt="Country">Macau</name>
       <iso-code>MO</iso-code>
       <fips-code>MC</fips-code>
       <timezones>
@@ -5233,7 +5233,7 @@
         <!-- The capital of Macau.
              The local name in Chinese is "Aomen / 澳门".
           -->
-        <_name msgctxt="City in Macau">Macau</_name>
+        <name msgctxt="City in Macau">Macau</name>
         <coordinates>22.200556 113.546111</coordinates>
         <location>
           <name>Taipa</name>
@@ -5245,7 +5245,7 @@
         <!-- A city in Macau.
              The local name in Chinese is "Dangzai / 氹仔".
           -->
-        <_name>Taipa</_name>
+        <name>Taipa</name>
         <coordinates>22.155833 113.556944</coordinates>
         <location>
           <name>Taipa</name>
@@ -5256,7 +5256,7 @@
     </country>
     <country>
       <!-- MY - Malaysia -->
-      <_name>Malaysia</_name>
+      <name>Malaysia</name>
       <!-- Could not find information about the following stations,
            which may be in Malaysia:
            WBGY WMAU WMKA WMKB WMKI WMKN 
@@ -5271,7 +5271,7 @@
       <tz-hint>Asia/Kuala_Lumpur</tz-hint>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Bintulu</_name>
+        <name>Bintulu</name>
         <coordinates>3.166667 113.033333</coordinates>
         <location>
           <name>Bintulu</name>
@@ -5281,7 +5281,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name msgctxt="City in Malaysia">George Town</_name>
+        <name msgctxt="City in Malaysia">George Town</name>
         <coordinates>5.416667 100.333333</coordinates>
         <location>
           <name>Bayan Lepas Airport</name>
@@ -5291,7 +5291,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Johor Bahru</_name>
+        <name>Johor Bahru</name>
         <coordinates>1.466667 103.750000</coordinates>
         <location>
           <name>Senai Airport</name>
@@ -5301,7 +5301,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Klang</_name>
+        <name>Klang</name>
         <coordinates>3.033333 101.450000</coordinates>
         <location>
           <name>Subang, Sultan Abdul Aziz Shah Airport</name>
@@ -5311,7 +5311,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kota Baharu</_name>
+        <name>Kota Baharu</name>
         <coordinates>6.133333 102.250000</coordinates>
         <location>
           <name>Kota Baharu</name>
@@ -5321,7 +5321,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kota Kinabalu</_name>
+        <name>Kota Kinabalu</name>
         <coordinates>5.983333 116.066667</coordinates>
         <location>
           <name>Kota Kinabalu</name>
@@ -5331,7 +5331,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kuah</_name>
+        <name>Kuah</name>
         <coordinates>6.316667 99.850000</coordinates>
         <location>
           <name>Kuah</name>
@@ -5341,7 +5341,7 @@
       </city>
       <city>
         <!-- The capital of Malaysia -->
-        <_name>Kuala Lumpur</_name>
+        <name>Kuala Lumpur</name>
         <coordinates>3.166667 101.700000</coordinates>
         <location>
           <name>Subang, Sultan Abdul Aziz Shah Airport</name>
@@ -5351,7 +5351,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kuantan</_name>
+        <name>Kuantan</name>
         <coordinates>3.800000 103.333333</coordinates>
         <location>
           <name>Kuantan</name>
@@ -5361,7 +5361,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kuching</_name>
+        <name>Kuching</name>
         <coordinates>1.550000 110.333333</coordinates>
         <location>
           <name>Kuching</name>
@@ -5371,7 +5371,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Kudat</_name>
+        <name>Kudat</name>
         <coordinates>6.879722 116.849167</coordinates>
         <location>
           <name>Kudat</name>
@@ -5381,7 +5381,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Melaka</_name>
+        <name>Melaka</name>
         <coordinates>2.196944 102.248056</coordinates>
         <location>
           <name>Melaka</name>
@@ -5391,7 +5391,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Miri</_name>
+        <name>Miri</name>
         <coordinates>4.383333 113.983333</coordinates>
         <location>
           <name>Miri</name>
@@ -5401,7 +5401,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Sandakan</_name>
+        <name>Sandakan</name>
         <coordinates>5.833333 118.116667</coordinates>
         <location>
           <name>Sandakan</name>
@@ -5411,7 +5411,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Sepang</_name>
+        <name>Sepang</name>
         <coordinates>2.700000 101.750000</coordinates>
         <location>
           <name>KL International Airport</name>
@@ -5421,7 +5421,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Sibu</_name>
+        <name>Sibu</name>
         <coordinates>2.300000 111.816667</coordinates>
         <location>
           <name>Sibu</name>
@@ -5431,7 +5431,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Sitiawan</_name>
+        <name>Sitiawan</name>
         <coordinates>4.216667 100.700000</coordinates>
         <location>
           <name>Sitiawan</name>
@@ -5441,7 +5441,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name>Tawau</_name>
+        <name>Tawau</name>
         <coordinates>4.250000 117.900000</coordinates>
         <location>
           <name>Tawau</name>
@@ -5451,7 +5451,7 @@
       </city>
       <city>
         <!-- A city in Malaysia -->
-        <_name msgctxt="City in Malaysia">Victoria</_name>
+        <name msgctxt="City in Malaysia">Victoria</name>
         <coordinates>5.276667 115.241667</coordinates>
         <location>
           <name>Victoria</name>
@@ -5462,7 +5462,7 @@
     </country>
     <country>
       <!-- MV - Maldives -->
-      <_name>Maldives</_name>
+      <name>Maldives</name>
       <iso-code>MV</iso-code>
       <fips-code>MV</fips-code>
       <timezones>
@@ -5474,7 +5474,7 @@
              "Male" is the traditional English name.
              The local name in Dhivehi is "Maale".
           -->
-        <_name>Male</_name>
+        <name>Male</name>
         <coordinates>4.166667 73.500000</coordinates>
         <location>
           <name>Male</name>
@@ -5485,7 +5485,7 @@
     </country>
     <country>
       <!-- MN - Mongolia -->
-      <_name>Mongolia</_name>
+      <name>Mongolia</name>
       <iso-code>MN</iso-code>
       <fips-code>MG</fips-code>
       <timezones>
@@ -5493,19 +5493,19 @@
           <!-- The time zone used in the eastern part of Mongolia.
                FIXME: Is there an official name for this zone?
             -->
-          <_name>Eastern Mongolia</_name>
+          <name>Eastern Mongolia</name>
         </timezone>
         <timezone id="Asia/Hovd">
           <!-- The time zone used in the western part of Mongolia.
                FIXME: Is there an official name for this zone?
             -->
-          <_name>Western Mongolia</_name>
+          <name>Western Mongolia</name>
         </timezone>
         <timezone id="Asia/Ulaanbaatar">
           <!-- The time zone used in the central part of Mongolia.
                FIXME: Is there an official name for this zone?
             -->
-          <_name>Central Mongolia</_name>
+          <name>Central Mongolia</name>
         </timezone>
       </timezones>
       <tz-hint>Asia/Ulaanbaatar</tz-hint>
@@ -5513,7 +5513,7 @@
         <!-- The capital of Mongolia.
              The name is also written "Улаанбаатар".
           -->
-        <_name>Ulaanbaatar</_name>
+        <name>Ulaanbaatar</name>
         <coordinates>47.916667 106.916667</coordinates>
         <location>
           <name>Ulaanbaatar</name>
@@ -5527,7 +5527,7 @@
            currently the official ISO 3166 short English name, and gets
            more Google hits in English)
         -->
-      <_name>Myanmar</_name>
+      <name>Myanmar</name>
       <!-- Could not find information about the following stations,
            which may be in Myanmar:
            VYMD 
@@ -5543,7 +5543,7 @@
              "Rangoon" is the traditional English name.
              The local name in Burmese is "Yangon".
           -->
-        <_name>Rangoon</_name>
+        <name>Rangoon</name>
         <coordinates>16.805278 96.156111</coordinates>
         <location>
           <name>Rangoon</name>
@@ -5554,7 +5554,7 @@
     </country>
     <country>
       <!-- NP - Nepal -->
-      <_name>Nepal</_name>
+      <name>Nepal</name>
       <iso-code>NP</iso-code>
       <fips-code>NP</fips-code>
       <timezones>
@@ -5565,7 +5565,7 @@
         <!-- The capital of Nepal.
              The local name in Nepali is "काठमाडौं".
           -->
-        <_name>Kathmandu</_name>
+        <name>Kathmandu</name>
         <coordinates>27.716667 85.316667</coordinates>
         <location>
           <name>Kathmandu Airport</name>
@@ -5578,7 +5578,7 @@
       <!-- KP - The Democratic People's Republic of Korea, aka North
            Korea
         -->
-      <_name>North Korea</_name>
+      <name>North Korea</name>
       <!-- Could not find weather stations for the following major
            cities:
            Pyongyang
@@ -5592,7 +5592,7 @@
     </country>
     <country>
       <!-- PK - Pakistan -->
-      <_name>Pakistan</_name>
+      <name>Pakistan</name>
       <iso-code>PK</iso-code>
       <fips-code>PK</fips-code>
       <timezones>
@@ -5601,7 +5601,7 @@
       <tz-hint>Asia/Karachi</tz-hint>
       <city>
         <!-- The capital of Pakistan -->
-        <_name>Islamabad</_name>
+        <name>Islamabad</name>
         <coordinates>33.700000 73.166667</coordinates>
         <location>
           <name>Islamabad Airport</name>
@@ -5611,7 +5611,7 @@
       </city>
       <city>
         <!-- A city in Pakistan -->
-        <_name>Karachi</_name>
+        <name>Karachi</name>
         <coordinates>24.866667 67.050000</coordinates>
         <location>
           <name>Karachi Airport</name>
@@ -5621,7 +5621,7 @@
       </city>
       <city>
         <!-- A city in Pakistan -->
-        <_name>Lahore</_name>
+        <name>Lahore</name>
         <coordinates>31.549722 74.343611</coordinates>
         <location>
           <name>Lahore Airport</name>
@@ -5631,7 +5631,7 @@
       </city>
       <city>
         <!-- A city in Pakistan -->
-        <_name>Nawabshah</_name>
+        <name>Nawabshah</name>
         <coordinates>26.250000 68.416667</coordinates>
         <location>
           <name>Nawabshah</name>
@@ -5642,7 +5642,7 @@
     </country>
     <country>
       <!-- PH - Philippines -->
-      <_name>Philippines</_name>
+      <name>Philippines</name>
       <iso-code>PH</iso-code>
       <fips-code>RP</fips-code>
       <timezones>
@@ -5651,7 +5651,7 @@
       <tz-hint>Asia/Manila</tz-hint>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Angeles</_name>
+        <name>Angeles</name>
         <coordinates>15.135833 120.591111</coordinates>
         <location>
           <name>Clarkfield Pampanga International Airport</name>
@@ -5661,7 +5661,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Davao</_name>
+        <name>Davao</name>
         <coordinates>7.073056 125.612778</coordinates>
         <location>
           <name>Davao Airport</name>
@@ -5671,7 +5671,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Laoag</_name>
+        <name>Laoag</name>
         <coordinates>18.198889 120.593611</coordinates>
         <location>
           <name>Laoag</name>
@@ -5681,7 +5681,7 @@
       </city>
       <city>
         <!-- The capital of the Philippines -->
-        <_name>Manila</_name>
+        <name>Manila</name>
         <coordinates>14.604167 120.982222</coordinates>
         <location>
           <name>Ninoy Aquino International Airport</name>
@@ -5691,7 +5691,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Masbate</_name>
+        <name>Masbate</name>
         <coordinates>12.366667 123.616667</coordinates>
         <location>
           <name>Masbate</name>
@@ -5701,7 +5701,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Pildira</_name>
+        <name>Pildira</name>
         <coordinates>14.516667 121.000000</coordinates>
         <location>
           <name>Ninoy Aquino International Airport</name>
@@ -5711,7 +5711,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Subic</_name>
+        <name>Subic</name>
         <coordinates>14.879722 120.233333</coordinates>
         <location>
           <name>Subic Bay Weather Station</name>
@@ -5721,7 +5721,7 @@
       </city>
       <city>
         <!-- A city in the Philippines -->
-        <_name>Zamboanga City</_name>
+        <name>Zamboanga City</name>
         <coordinates>6.910255 122.071715</coordinates>
         <location>
           <name>Zamboanga City</name>
@@ -5732,7 +5732,7 @@
     </country>
     <country>
       <!-- SG - Singapore -->
-      <_name msgctxt="Country">Singapore</_name>
+      <name msgctxt="Country">Singapore</name>
       <!-- Could not find information about the following stations,
            which may be in Singapore:
            WSSL 
@@ -5745,7 +5745,7 @@
       <tz-hint>Asia/Singapore</tz-hint>
       <city>
         <!-- The capital of Singapore -->
-        <_name msgctxt="City in Singapore">Singapore</_name>
+        <name msgctxt="City in Singapore">Singapore</name>
         <coordinates>1.293056 103.855833</coordinates>
         <location>
           <name>Paya Lebar Airport</name>
@@ -5761,7 +5761,7 @@
     </country>
     <country>
       <!-- KR - The Republic of Korea, aka South Korea -->
-      <_name>South Korea</_name>
+      <name>South Korea</name>
       <!-- Could not find information about the following stations,
            which may be in South Korea:
            RKJB RKNY 
@@ -5774,7 +5774,7 @@
       <tz-hint>Asia/Seoul</tz-hint>
       <city>
         <!-- A city in South Korea -->
-        <_name>Ch'ongju</_name>
+        <name>Ch'ongju</name>
         <coordinates>36.637222 127.489722</coordinates>
         <location>
           <name>Chongju Air Base</name>
@@ -5784,7 +5784,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>Cheju</_name>
+        <name>Cheju</name>
         <coordinates>33.509722 126.521944</coordinates>
         <location>
           <name>Cheju International Airport</name>
@@ -5794,7 +5794,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>Inch'on</_name>
+        <name>Inch'on</name>
         <coordinates>37.453611 126.731667</coordinates>
         <location>
           <name>Inch'on International Airport</name>
@@ -5804,7 +5804,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>Kunsan</_name>
+        <name>Kunsan</name>
         <coordinates>35.978611 126.711389</coordinates>
         <location>
           <name>Kunsan Air Base</name>
@@ -5816,7 +5816,7 @@
         <!-- A city in South Korea.
              The name is also written "오산".
           -->
-        <_name>Osan</_name>
+        <name>Osan</name>
         <coordinates>37.152222 127.070556</coordinates>
         <location>
           <name>Osan Air Base</name>
@@ -5826,7 +5826,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>P'yongt'aek</_name>
+        <name>P'yongt'aek</name>
         <coordinates>36.994722 127.088889</coordinates>
         <location>
           <name>Pyongtaek Air Base</name>
@@ -5836,7 +5836,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>Pusan</_name>
+        <name>Pusan</name>
         <coordinates>35.102778 129.040278</coordinates>
         <location>
           <name>Kimhae International Airport</name>
@@ -5849,7 +5849,7 @@
              "Seoul" is the traditional English name.
              The local name in Korean is "Soul".
           -->
-        <_name>Seoul</_name>
+        <name>Seoul</name>
         <coordinates>37.566389 126.999722</coordinates>
         <location>
           <name>Kimp'o International Airport</name>
@@ -5859,7 +5859,7 @@
       </city>
       <city>
         <!-- A city in South Korea -->
-        <_name>Taegu</_name>
+        <name>Taegu</name>
         <coordinates>35.870278 128.591111</coordinates>
         <location>
           <name>Taegu Air Base</name>
@@ -5870,7 +5870,7 @@
     </country>
     <country>
       <!-- LK - Sri Lanka -->
-      <_name>Sri Lanka</_name>
+      <name>Sri Lanka</name>
       <iso-code>LK</iso-code>
       <fips-code>CE</fips-code>
       <timezones>
@@ -5879,7 +5879,7 @@
       <tz-hint>Asia/Colombo</tz-hint>
       <city>
         <!-- The capital of Sri Lanka -->
-        <_name>Colombo</_name>
+        <name>Colombo</name>
         <coordinates>6.931944 79.847778</coordinates>
         <location>
           <name>Katunayake</name>
@@ -5889,7 +5889,7 @@
       </city>
       <city>
         <!-- A city in Sri Lanka -->
-        <_name>Katunayaka</_name>
+        <name>Katunayaka</name>
         <coordinates>7.164722 79.873056</coordinates>
         <location>
           <name>Katunayaka</name>
@@ -5899,7 +5899,7 @@
       </city>
       <city>
         <!-- The capital of Sri Lanka -->
-        <_name>Sri Jayewardenepura Kotte</_name>
+        <name>Sri Jayewardenepura Kotte</name>
         <coordinates>6.902778 79.908333</coordinates>
         <location>
           <name>Katunayake</name>
@@ -5912,7 +5912,7 @@
       <!-- TW - Taiwan, Province of China. (That's the official ISO
            3166 short English name.)
         -->
-      <_name>Taiwan</_name>
+      <name>Taiwan</name>
       <iso-code>TW</iso-code>
       <fips-code>TW</fips-code>
       <timezones>
@@ -5923,7 +5923,7 @@
         <!-- A city in Taiwan.
              The name is also written "高雄".
           -->
-        <_name>Kaohsiung</_name>
+        <name>Kaohsiung</name>
         <coordinates>22.616256 120.313329</coordinates>
         <location>
           <name>Kaohsiung City</name>
@@ -5935,7 +5935,7 @@
         <!-- A city in Taiwan.
              The name is also written "埔頂".
           -->
-        <_name>Taoyuan</_name>
+        <name>Taoyuan</name>
         <coordinates>25.083498 121.215105</coordinates>
         <location>
           <name>Taoyuan International Airport</name>
@@ -5947,7 +5947,7 @@
         <!-- The capital of Taiwan.
              The name is also written "臺北".
           -->
-        <_name>Taipei</_name>
+        <name>Taipei</name>
         <coordinates>25.047763 121.531846</coordinates>
         <location>
           <name>Taipei / Songshan Domestic Airport</name>
@@ -5958,7 +5958,7 @@
     </country>
     <country>
       <!-- TJ - Tajikistan -->
-      <_name>Tajikistan</_name>
+      <name>Tajikistan</name>
       <iso-code>TJ</iso-code>
       <fips-code>TI</fips-code>
       <timezones>
@@ -5967,7 +5967,7 @@
       <tz-hint>Asia/Dushanbe</tz-hint>
       <city>
         <!-- The capital of Tajikistan -->
-        <_name>Dushanbe</_name>
+        <name>Dushanbe</name>
         <coordinates>38.560000 68.773889</coordinates>
         <location>
           <name>Dushanbe</name>
@@ -5978,7 +5978,7 @@
     </country>
     <country>
       <!-- TH - Thailand -->
-      <_name>Thailand</_name>
+      <name>Thailand</name>
       <!-- Could not find information about the following stations,
            which may be in Thailand:
            VTBO VTCT VTPO VTPP VTSC VTSF VTSG VTSM VTUI VTUO VTUV VTUW 
@@ -5994,7 +5994,7 @@
              "Bangkok" is the traditional English name.
              The local name in Thai is "Krung Thep / กรุงเทพฯ".
           -->
-        <_name>Bangkok</_name>
+        <name>Bangkok</name>
         <coordinates>13.750000 100.516667</coordinates>
         <location>
           <name>Bangkok</name>
@@ -6004,7 +6004,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Chiang Mai</_name>
+        <name>Chiang Mai</name>
         <coordinates>18.790278 98.981667</coordinates>
         <location>
           <name>Chiang Mai</name>
@@ -6014,7 +6014,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Chon Buri</_name>
+        <name>Chon Buri</name>
         <coordinates>13.366667 100.983333</coordinates>
         <location>
           <name>Chon Buri</name>
@@ -6024,7 +6024,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Hat Yai</_name>
+        <name>Hat Yai</name>
         <coordinates>7.016667 100.466667</coordinates>
         <location>
           <name>Hat Yai</name>
@@ -6034,7 +6034,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Hua Hin</_name>
+        <name>Hua Hin</name>
         <coordinates>12.566667 99.966667</coordinates>
         <location>
           <name>Hua Hin</name>
@@ -6044,7 +6044,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Khon Kaen</_name>
+        <name>Khon Kaen</name>
         <coordinates>16.433333 102.833333</coordinates>
         <location>
           <name>Khon Kaen</name>
@@ -6054,7 +6054,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Lampang</_name>
+        <name>Lampang</name>
         <coordinates>18.298333 99.507222</coordinates>
         <location>
           <name>Lampang</name>
@@ -6064,7 +6064,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Mae Hong Son</_name>
+        <name>Mae Hong Son</name>
         <coordinates>19.266667 97.933333</coordinates>
         <location>
           <name>Mae Hong Son</name>
@@ -6074,7 +6074,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Nan</_name>
+        <name>Nan</name>
         <coordinates>18.783333 100.783333</coordinates>
         <location>
           <name>Nan</name>
@@ -6084,7 +6084,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Phrae</_name>
+        <name>Phrae</name>
         <coordinates>18.150000 100.133333</coordinates>
         <location>
           <name>Phrae</name>
@@ -6094,7 +6094,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Phuket</_name>
+        <name>Phuket</name>
         <coordinates>7.883333 98.400000</coordinates>
         <location>
           <name>Phuket Airport</name>
@@ -6104,7 +6104,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Ranong</_name>
+        <name>Ranong</name>
         <coordinates>9.966667 98.633333</coordinates>
         <location>
           <name>Ranong</name>
@@ -6114,7 +6114,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Rayong</_name>
+        <name>Rayong</name>
         <coordinates>12.666667 101.283333</coordinates>
         <location>
           <name>Rayong</name>
@@ -6124,7 +6124,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Surat Thani</_name>
+        <name>Surat Thani</name>
         <coordinates>9.133333 99.316667</coordinates>
         <location>
           <name>Surat Thani</name>
@@ -6134,7 +6134,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Trang</_name>
+        <name>Trang</name>
         <coordinates>7.550000 99.600000</coordinates>
         <location>
           <name>Trang</name>
@@ -6144,7 +6144,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Ubon Ratchathani</_name>
+        <name>Ubon Ratchathani</name>
         <coordinates>15.233056 104.863056</coordinates>
         <location>
           <name>Ubon Ratchathani</name>
@@ -6154,7 +6154,7 @@
       </city>
       <city>
         <!-- A city in Thailand -->
-        <_name>Udon Thani</_name>
+        <name>Udon Thani</name>
         <coordinates>17.407500 102.793056</coordinates>
         <location>
           <name>Udon Thani</name>
@@ -6165,7 +6165,7 @@
     </country>
     <country>
       <!-- TM - Turkmenistan -->
-      <_name>Turkmenistan</_name>
+      <name>Turkmenistan</name>
       <iso-code>TM</iso-code>
       <fips-code>TX</fips-code>
       <timezones>
@@ -6177,7 +6177,7 @@
              "Ashgabat" is the traditional English name.
              The local name in Turkmen is "Asgabat".
           -->
-        <_name>Ashgabat</_name>
+        <name>Ashgabat</name>
         <coordinates>37.950000 58.383333</coordinates>
         <location>
           <name>Ashgabat</name>
@@ -6188,7 +6188,7 @@
     </country>
     <country>
       <!-- UZ - Uzbekistan -->
-      <_name>Uzbekistan</_name>
+      <name>Uzbekistan</name>
       <!-- Could not find information about the following stations,
            which may be in Uzbekistan:
            UTAK UTAM UTAT UTAV UTDL UTFN UTSB UTSH UTSK 
@@ -6203,7 +6203,7 @@
       <tz-hint>Asia/Tashkent</tz-hint>
       <city>
         <!-- A city in Uzbekistan -->
-        <_name>Nukus</_name>
+        <name>Nukus</name>
         <coordinates>42.453056 59.610278</coordinates>
         <location>
           <name>Nukus / Karakalpakstan</name>
@@ -6213,7 +6213,7 @@
       </city>
       <city>
         <!-- A city in Uzbekistan -->
-        <_name>Samarqand</_name>
+        <name>Samarqand</name>
         <coordinates>39.654167 66.959722</coordinates>
         <location>
           <name>Samarqand</name>
@@ -6226,7 +6226,7 @@
              "Tashkent" is the traditional English name.
              The local name is "Toshkent".
           -->
-        <_name>Tashkent</_name>
+        <name>Tashkent</name>
         <coordinates>41.316667 69.250000</coordinates>
         <location>
           <name>Tashkent</name>
@@ -6236,7 +6236,7 @@
       </city>
       <city>
         <!-- A city in Uzbekistan -->
-        <_name>Termiz</_name>
+        <name>Termiz</name>
         <coordinates>37.224167 67.278333</coordinates>
         <location>
           <name>Termiz</name>
@@ -6246,7 +6246,7 @@
       </city>
       <city>
         <!-- A city in Uzbekistan -->
-        <_name>Urganch</_name>
+        <name>Urganch</name>
         <coordinates>41.550000 60.633333</coordinates>
         <location>
           <name>Urganch</name>
@@ -6260,7 +6260,7 @@
            includes a space, though it is also frequently written
            without one.)
         -->
-      <_name>Viet Nam</_name>
+      <name>Viet Nam</name>
       <iso-code>VN</iso-code>
       <fips-code>VM</fips-code>
       <timezones>
@@ -6269,7 +6269,7 @@
       <tz-hint>Asia/Ho_Chi_Minh</tz-hint>
       <city>
         <!-- A city in Viet Nam -->
-        <_name>Da Nang</_name>
+        <name>Da Nang</name>
         <coordinates>16.067778 108.220833</coordinates>
         <location>
           <name>Da Nang</name>
@@ -6282,7 +6282,7 @@
              "Hanoi" is the traditional English name.
              The local name in Vietnamese is "Ha Noi".
           -->
-        <_name>Hanoi</_name>
+        <name>Hanoi</name>
         <coordinates>21.033333 105.850000</coordinates>
         <location>
           <name>Hanoi</name>
@@ -6295,7 +6295,7 @@
              "Ho Chi Minh City" is the traditional English name.
              The local name in Vietnamese is "Thanh Pho Ho Chi Minh".
           -->
-        <_name>Ho Chi Minh City</_name>
+        <name>Ho Chi Minh City</name>
         <coordinates>10.750000 106.666667</coordinates>
         <location>
           <name>Ho Chi Minh</name>
@@ -6307,10 +6307,10 @@
   </region>
   <region>
     <!-- FIXME: rename this to Atlantic Ocean -->
-    <_name msgctxt="Region">Atlantic</_name>
+    <name msgctxt="Region">Atlantic</name>
     <country>
       <!-- AI - Anguilla, a British territory in the Caribbean -->
-      <_name>Anguilla</_name>
+      <name>Anguilla</name>
       <iso-code>AI</iso-code>
       <fips-code>AV</fips-code>
       <timezones>
@@ -6319,7 +6319,7 @@
       <tz-hint>America/Anguilla</tz-hint>
       <city>
         <!-- The capital of Anguilla -->
-        <_name>The Valley</_name>
+        <name>The Valley</name>
         <coordinates>18.216667 -63.050000</coordinates>
         <location>
           <name>Wallblake</name>
@@ -6330,7 +6330,7 @@
     </country>
     <country>
       <!-- AG - Antigua and Barbuda -->
-      <_name>Antigua and Barbuda</_name>
+      <name>Antigua and Barbuda</name>
       <iso-code>AG</iso-code>
       <fips-code>AC</fips-code>
       <timezones>
@@ -6339,7 +6339,7 @@
       <tz-hint>America/Antigua</tz-hint>
       <city>
         <!-- A city in Antigua and Barbuda -->
-        <_name>Fitches Creek</_name>
+        <name>Fitches Creek</name>
         <coordinates>17.116667 -61.783333</coordinates>
         <location>
           <name>V. C. Bird International Airport, Antigua</name>
@@ -6349,7 +6349,7 @@
       </city>
       <city>
         <!-- The capital of Antigua and Barbuda -->
-        <_name msgctxt="City in Antigua and Barbuda">Saint John's</_name>
+        <name msgctxt="City in Antigua and Barbuda">Saint John's</name>
         <coordinates>17.116667 -61.850000</coordinates>
         <location>
           <name>V. C. Bird International Airport, Antigua</name>
@@ -6360,7 +6360,7 @@
     </country>
     <country>
       <!-- BB - Barbados -->
-      <_name>Barbados</_name>
+      <name>Barbados</name>
       <iso-code>BB</iso-code>
       <fips-code>BB</fips-code>
       <timezones>
@@ -6369,7 +6369,7 @@
       <tz-hint>America/Barbados</tz-hint>
       <city>
         <!-- The capital of Barbados -->
-        <_name>Bridgetown</_name>
+        <name>Bridgetown</name>
         <coordinates>13.100000 -59.616667</coordinates>
         <location>
           <name>Grantley Adams</name>
@@ -6379,7 +6379,7 @@
       </city>
       <city>
         <!-- A city in Barbados -->
-        <_name>Paragon</_name>
+        <name>Paragon</name>
         <coordinates>13.066667 -59.483333</coordinates>
         <location>
           <name>Grantley Adams</name>
@@ -6392,7 +6392,7 @@
       <!-- BM - Bermuda, a British territory off the coast of the
            United States
         -->
-      <_name>Bermuda</_name>
+      <name>Bermuda</name>
       <iso-code>BM</iso-code>
       <fips-code>BD</fips-code>
       <timezones>
@@ -6401,7 +6401,7 @@
       <tz-hint>Atlantic/Bermuda</tz-hint>
       <city>
         <!-- The capital of Bermuda -->
-        <_name msgctxt="City in Bermuda">Hamilton</_name>
+        <name msgctxt="City in Bermuda">Hamilton</name>
         <coordinates>32.294167 -64.783889</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6411,7 +6411,7 @@
       </city>
       <city>
         <!-- A city in Bermuda -->
-        <_name msgctxt="City in Bermuda">Saint George</_name>
+        <name msgctxt="City in Bermuda">Saint George</name>
         <coordinates>32.381667 -64.678056</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6424,7 +6424,7 @@
       <!-- DM - Dominica, a Caribbean island nation, not to be confused
            with the Domincan Republic.
         -->
-      <_name>Dominica</_name>
+      <name>Dominica</name>
       <iso-code>DM</iso-code>
       <fips-code>DO</fips-code>
       <timezones>
@@ -6433,7 +6433,7 @@
       <tz-hint>America/Dominica</tz-hint>
       <city>
         <!-- A city in Dominica -->
-        <_name>Marigot</_name>
+        <name>Marigot</name>
         <coordinates>15.533333 -61.300000</coordinates>
         <location>
           <name>Melville Hall Airport</name>
@@ -6443,7 +6443,7 @@
       </city>
       <city>
         <!-- The capital of Dominica -->
-        <_name msgctxt="City in Dominica">Roseau</_name>
+        <name msgctxt="City in Dominica">Roseau</name>
         <coordinates>15.300000 -61.400000</coordinates>
         <location>
           <name>Canefield Airport</name>
@@ -6453,7 +6453,7 @@
       </city>
       <city>
         <!-- A city in Dominica -->
-        <_name>Saint Joseph</_name>
+        <name>Saint Joseph</name>
         <coordinates>15.400000 -61.433333</coordinates>
         <location>
           <name>Canefield Airport</name>
@@ -6466,7 +6466,7 @@
       <!-- GL - Greenland, an autonomous province of Denmark in the
            North Atlantic.
         -->
-      <_name>Greenland</_name>
+      <name>Greenland</name>
       <!-- Could not find information about the following stations,
            which may be in Greenland:
            BGAA BGMQ BGPT BGQQ BGSS BGUK 
@@ -6480,26 +6480,26 @@
                The string is only used in places where "Greenland" is
                already clear from context.
             -->
-          <_name>Danmarkshavn</_name>
+          <name>Danmarkshavn</name>
         </timezone>
         <timezone id="America/Godthab">
           <!-- The primary timezone for Greenland, although sources
                seem to point towards calling the area "Western
                Greenland" rathern than just "Greenland".
             -->
-          <_name>Western Greenland</_name>
+          <name>Western Greenland</name>
         </timezone>
         <timezone id="America/Scoresbysund">
           <!-- The timezone around Scoresbysund / Ittoqqortoormiit on
                the east coast of Greenland.
             -->
-          <_name>Eastern Greenland</_name>
+          <name>Eastern Greenland</name>
         </timezone>
         <timezone id="America/Thule">
           <!-- The timezone at the Thule US Air Force Base on the west
                coast of Greenland.
             -->
-          <_name>Thule AFB</_name>
+          <name>Thule AFB</name>
         </timezone>
       </timezones>
       <tz-hint>America/Godthab</tz-hint>
@@ -6507,7 +6507,7 @@
         <!-- A city in Greenland.
              The local name in Kalaallisut is "Uummannaq".
           -->
-        <_name>Dundas</_name>
+        <name>Dundas</name>
         <coordinates>76.550000 -68.800000</coordinates>
         <location>
           <name>Thule A. B.</name>
@@ -6520,7 +6520,7 @@
         <!-- The capital of Greenland.
              The local name in Kalaallisut is "Nuuk".
           -->
-        <_name>Godthåb</_name>
+        <name>Godthåb</name>
         <coordinates>64.183333 -51.750000</coordinates>
         <location>
           <name>Godthåb / Godthåb</name>
@@ -6530,7 +6530,7 @@
       </city>
       <city>
         <!-- A city in Greenland -->
-        <_name>Ittorisseq</_name>
+        <name>Ittorisseq</name>
         <coordinates>70.450000 -22.450000</coordinates>
         <location>
           <name>Constable Pynt</name>
@@ -6542,7 +6542,7 @@
         <!-- A city in Greenland.
              The local name in Kalaallisut is "Ilulissat".
           -->
-        <_name>Jakobshavn</_name>
+        <name>Jakobshavn</name>
         <coordinates>69.216667 -51.100000</coordinates>
         <location>
           <name>Jacobshavn Airport</name>
@@ -6552,7 +6552,7 @@
       </city>
       <city>
         <!-- A city in Greenland -->
-        <_name>Kulusuk</_name>
+        <name>Kulusuk</name>
         <coordinates>65.566667 -37.183333</coordinates>
         <location>
           <name>Kulusuk Airport</name>
@@ -6562,7 +6562,7 @@
       </city>
       <city>
         <!-- A city in Greenland -->
-        <_name>Narsarsuaq</_name>
+        <name>Narsarsuaq</name>
         <coordinates>61.166667 -45.416667</coordinates>
         <location>
           <name>Narsarsuaq</name>
@@ -6572,7 +6572,7 @@
       </city>
       <city>
         <!-- A city in Greenland -->
-        <_name>Søndre Strømfjord</_name>
+        <name>Søndre Strømfjord</name>
         <coordinates>67.000000 -50.700000</coordinates>
         <location>
           <name>Sdr Stroemfjord</name>
@@ -6592,18 +6592,18 @@
            * Ponce:    TJPS
            * Vieques:  TJVQ
         -->
-      <_name>Puerto Rico</_name>
+      <name>Puerto Rico</name>
       <iso-code>PR</iso-code>
       <fips-code>US72</fips-code>
       <timezones>
         <timezone id="America/Puerto_Rico">
-          <_name>Atlantic Time</_name>
+          <name>Atlantic Time</name>
         </timezone>
       </timezones>
       <tz-hint>America/Puerto_Rico</tz-hint>
       <city>
         <!-- A municipality of Puerto Rico -->
-        <_name>Aguadilla</_name>
+        <name>Aguadilla</name>
         <coordinates>18.430000 -67.154444</coordinates>
         <location>
           <name>Rafael Hernández International Airport</name>
@@ -6615,7 +6615,7 @@
       </city>
       <city>
         <!-- A municipality of Puerto Rico -->
-        <_name>Carolina</_name>
+        <name>Carolina</name>
         <coordinates>18.406111 -65.967222</coordinates>
         <location>
           <name>Luis Muñoz Marín International Airport</name>
@@ -6647,7 +6647,7 @@
       </city>
       <city>
         <!-- A municipality of Puerto Rico -->
-        <_name>San Juan</_name>
+        <name>San Juan</name>
         <coordinates>18.466334 -66.105722</coordinates>
         <location>
           <name>Fernando Luis Ribas Dominicci Airport (Isla Grande Airport)</name>
@@ -6662,7 +6662,7 @@
       <!-- BL - Saint Barthélemy, an overseas territory of France in
            the Caribbean, formerly part of Guadeloupe.
         -->
-      <_name>Saint Barthélemy</_name>
+      <name>Saint Barthélemy</name>
       <iso-code>BL</iso-code>
       <fips-code>TB</fips-code>
       <timezones>
@@ -6672,7 +6672,7 @@
     </country>
     <country>
       <!-- SH - Saint Helena, a British territory in the South Atlantic -->
-      <_name>Saint Helena</_name>
+      <name>Saint Helena</name>
       <!-- Could not find weather stations for the following major
            cities:
            Jamestown
@@ -6685,7 +6685,7 @@
       <tz-hint>Atlantic/St_Helena</tz-hint>
       <city>
         <!-- A city in Saint Helena -->
-        <_name msgctxt="City in Saint Helena">Georgetown</_name>
+        <name msgctxt="City in Saint Helena">Georgetown</name>
         <coordinates>-7.933333 -14.416667</coordinates>
         <location>
           <name>Wide Awake Field Ascension Island</name>
@@ -6696,7 +6696,7 @@
     </country>
     <country>
       <!-- KN - Saint Kitts and Nevis -->
-      <_name>Saint Kitts and Nevis</_name>
+      <name>Saint Kitts and Nevis</name>
       <iso-code>KN</iso-code>
       <fips-code>SC</fips-code>
       <timezones>
@@ -6705,7 +6705,7 @@
       <tz-hint>America/St_Kitts</tz-hint>
       <city>
         <!-- The capital of Saint Kitts and Nevis -->
-        <_name>Basseterre</_name>
+        <name>Basseterre</name>
         <coordinates>17.300000 -62.716667</coordinates>
         <location>
           <name>Golden Rock</name>
@@ -6715,7 +6715,7 @@
       </city>
       <city>
         <!-- A city in Saint Kitts and Nevis -->
-        <_name>Golden Rock</_name>
+        <name>Golden Rock</name>
         <coordinates>17.316667 -62.716667</coordinates>
         <location>
           <name>Golden Rock</name>
@@ -6725,7 +6725,7 @@
       </city>
       <city>
         <!-- A city in Saint Kitts and Nevis -->
-        <_name msgctxt="City in Saint Kitts and Nevis">Newcastle</_name>
+        <name msgctxt="City in Saint Kitts and Nevis">Newcastle</name>
         <coordinates>17.200000 -62.583333</coordinates>
         <location>
           <name>Charlestown / Newcastle</name>
@@ -6738,18 +6738,18 @@
       <!-- VI - United States Virgin Islands, a territory of the United
            States in the Caribbean
         -->
-      <_name>United States Virgin Islands</_name>
+      <name>United States Virgin Islands</name>
       <iso-code>VI</iso-code>
       <fips-code>US78</fips-code>
       <timezones>
         <timezone id="America/St_Thomas">
-          <_name>Atlantic Time</_name>
+          <name>Atlantic Time</name>
         </timezone>
       </timezones>
       <tz-hint>America/St_Thomas</tz-hint>
       <city>
         <!-- A city in the United States Virgin Islands -->
-        <_name>Charlotte Amalie</_name>
+        <name>Charlotte Amalie</name>
         <coordinates>18.341900 -64.930701</coordinates>
         <location>
           <name>Charlotte Amalie St. Thomas, Cyril E. King Airport</name>
@@ -6759,7 +6759,7 @@
       </city>
       <city>
         <!-- A city in the United States Virgin Islands -->
-        <_name>Christiansted</_name>
+        <name>Christiansted</name>
         <coordinates>17.746640 -64.703198</coordinates>
         <location>
           <name>Henry E. Rohlsen Airport</name>
@@ -6770,13 +6770,13 @@
     </country>
   </region>
   <region>
-    <_name>Australasia &amp; Oceania</_name>
+    <name>Australasia &amp; Oceania</name>
     <country>
       <!-- AS - American Samoa, a territory of the United States in the
            South Pacific, not to be confused with the separate nation
            of "Samoa".
         -->
-      <_name>American Samoa</_name>
+      <name>American Samoa</name>
       <iso-code>AS</iso-code>
       <fips-code>US60</fips-code>
       <timezones>
@@ -6785,7 +6785,7 @@
       <tz-hint>Pacific/Pago_Pago</tz-hint>
       <city>
         <!-- A city in American Samoa -->
-        <_name>Pago Pago</_name>
+        <name>Pago Pago</name>
         <coordinates>-14.278056 -170.702500</coordinates>
         <location>
           <name>Pago Pago International Airport</name>
@@ -6796,7 +6796,7 @@
     </country>
     <country>
       <!-- AU - Australia -->
-      <_name>Australia</_name>
+      <name>Australia</name>
       <!-- Could not find information about the following stations,
            which may be in Australia:
            YBHM 
@@ -6809,7 +6809,7 @@
                only used in places where "Australia" is already clear
                from context.
             -->
-          <_name>Western Time</_name>
+          <name>Western Time</name>
         </timezone>
         <timezone id="Australia/Eucla">
           <!-- The commonly-used name for an unofficial time zone used
@@ -6817,7 +6817,7 @@
                used in places where "Australia" is already clear from
                context.
             -->
-          <_name>Central Western Time</_name>
+          <name>Central Western Time</name>
         </timezone>
         <timezone id="Australia/Adelaide">
           <!-- The time zone used in Central Australia. This string is
@@ -6825,7 +6825,7 @@
                state of South Australia, and is only used in places
                where "Australia" is already clear from context.
             -->
-          <_name>Central Time (South Australia)</_name>
+          <name>Central Time (South Australia)</name>
         </timezone>
         <timezone id="Australia/Broken_Hill">
           <!-- The time zone used in Central Australia. This string is
@@ -6835,7 +6835,7 @@
                state uses Eastern Time. This string is only used in
                places where "Australia" is already clear from context.
             -->
-          <_name>Central Time (Yancowinna, NSW)</_name>
+          <name>Central Time (Yancowinna, NSW)</name>
         </timezone>
         <timezone id="Australia/Darwin">
           <!-- The time zone used in Central Australia. This string is
@@ -6844,7 +6844,7 @@
                string is only used in places where "Australia" is
                already clear from context.
             -->
-          <_name>Central Time (Northern Territory)</_name>
+          <name>Central Time (Northern Territory)</name>
         </timezone>
         <timezone id="Australia/Hobart">
           <!-- The time zone used in Eastern Australia. This string is
@@ -6852,7 +6852,7 @@
                state of Tasmania, and is only used in places where
                "Australia" is already clear from context.
             -->
-          <_name>Eastern Time (Tasmania)</_name>
+          <name>Eastern Time (Tasmania)</name>
           <obsoletes>Australia/Currie</obsoletes>
         </timezone>
         <timezone id="Australia/Melbourne">
@@ -6861,7 +6861,7 @@
                state of Victoria, and is only used in places where
                "Australia" is already clear from context.
             -->
-          <_name>Eastern Time (Victoria)</_name>
+          <name>Eastern Time (Victoria)</name>
         </timezone>
         <timezone id="Australia/Sydney">
           <!-- The time zone used in Eastern Australia. This string is
@@ -6869,7 +6869,7 @@
                state of New South Wales, and is only used in places
                where "Australia" is already clear from context.
             -->
-          <_name>Eastern Time (New South Wales)</_name>
+          <name>Eastern Time (New South Wales)</name>
         </timezone>
         <timezone id="Australia/Brisbane">
           <!-- The time zone used in Eastern Australia. This string is
@@ -6878,7 +6878,7 @@
                This string is only used in places where "Australia" is
                already clear from context.
             -->
-          <_name>Eastern Time (Queensland)</_name>
+          <name>Eastern Time (Queensland)</name>
           <obsoletes>Australia/Lindeman</obsoletes>
         </timezone>
         <timezone id="Australia/Lord_Howe">
@@ -6886,17 +6886,17 @@
                coast of Australia. This string is only used in places
                where "Australia" is already clear from context.
             -->
-          <_name>Lord Howe Island</_name>
+          <name>Lord Howe Island</name>
         </timezone>
       </timezones>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>Australian Capital Territory</_name>
+        <name>Australian Capital Territory</name>
         <fips-code>AS01</fips-code>
         <tz-hint>Australia/Sydney</tz-hint>
         <city>
           <!-- The capital of Australia -->
-          <_name>Canberra</_name>
+          <name>Canberra</name>
           <coordinates>-35.283333 149.216667</coordinates>
           <location>
             <name>Canberra</name>
@@ -6908,12 +6908,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>New South Wales</_name>
+        <name>New South Wales</name>
         <fips-code>AS02</fips-code>
         <tz-hint>Australia/Sydney</tz-hint>
         <city>
           <!-- A city in New South Wales in Australia -->
-          <_name>Dubbo</_name>
+          <name>Dubbo</name>
           <coordinates>-32.250000 148.616667</coordinates>
           <location>
             <name>Dubbo</name>
@@ -6923,7 +6923,7 @@
         </city>
         <city>
           <!-- A city in New South Wales in Australia -->
-          <_name>Forest Hill</_name>
+          <name>Forest Hill</name>
           <coordinates>-35.150000 147.466667</coordinates>
           <location>
             <name>Wagga Airport</name>
@@ -6933,7 +6933,7 @@
         </city>
         <city>
           <!-- A city in New South Wales in Australia -->
-          <_name msgctxt="City in New South Wales, Australia">Richmond</_name>
+          <name msgctxt="City in New South Wales, Australia">Richmond</name>
           <coordinates>-33.600000 150.766667</coordinates>
           <location>
             <name>Richmond Air Force Base</name>
@@ -6943,7 +6943,7 @@
         </city>
         <city>
           <!-- A city in New South Wales in Australia -->
-          <_name msgctxt="City in New South Wales, Australia">Sydney</_name>
+          <name msgctxt="City in New South Wales, Australia">Sydney</name>
           <coordinates>-33.883333 151.216667</coordinates>
           <location>
             <name>Sydney Airport</name>
@@ -6954,7 +6954,7 @@
         </city>
         <city>
           <!-- A city in New South Wales in Australia -->
-          <_name>Tamworth</_name>
+          <name>Tamworth</name>
           <coordinates>-31.100000 150.933333</coordinates>
           <location>
             <name>Tamworth Airport</name>
@@ -6965,12 +6965,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>Northern Territory</_name>
+        <name>Northern Territory</name>
         <fips-code>AS03</fips-code>
         <tz-hint>Australia/Darwin</tz-hint>
         <city>
           <!-- A city in Northern Territory in Australia -->
-          <_name>Alice Springs</_name>
+          <name>Alice Springs</name>
           <coordinates>-23.700000 133.883333</coordinates>
           <location>
             <name>Alice Springs Airport</name>
@@ -6981,7 +6981,7 @@
         </city>
         <city>
           <!-- A city in Northern Territory in Australia -->
-          <_name>Darwin</_name>
+          <name>Darwin</name>
           <coordinates>-12.466667 130.833333</coordinates>
           <location>
             <name>Darwin Airport</name>
@@ -6992,7 +6992,7 @@
         </city>
         <city>
           <!-- A city in Northern Territory in Australia -->
-          <_name>Katherine</_name>
+          <name>Katherine</name>
           <coordinates>-14.466667 132.266667</coordinates>
           <location>
             <name>Tindal / Katherine</name>
@@ -7003,12 +7003,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>Queensland</_name>
+        <name>Queensland</name>
         <fips-code>AS04</fips-code>
         <tz-hint>Australia/Brisbane</tz-hint>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Brisbane</_name>
+          <name>Brisbane</name>
           <coordinates>-27.500000 153.016667</coordinates>
           <location>
             <name>Brisbane Airport</name>
@@ -7019,7 +7019,7 @@
         </city>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Cairns</_name>
+          <name>Cairns</name>
           <coordinates>-16.916667 145.766667</coordinates>
           <location>
             <name>Cairns Airport</name>
@@ -7029,7 +7029,7 @@
         </city>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Coolangatta</_name>
+          <name>Coolangatta</name>
           <coordinates>-28.166667 153.533333</coordinates>
           <location>
             <name>Coolangatta Airport</name>
@@ -7039,7 +7039,7 @@
         </city>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Mount Isa</_name>
+          <name>Mount Isa</name>
           <coordinates>-20.733333 139.500000</coordinates>
           <location>
             <name>Mount Isa Airport</name>
@@ -7049,7 +7049,7 @@
         </city>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Rockhampton</_name>
+          <name>Rockhampton</name>
           <coordinates>-23.383333 150.500000</coordinates>
           <location>
             <name>Rockhampton Airport</name>
@@ -7059,7 +7059,7 @@
         </city>
         <city>
           <!-- A city in Queensland in Australia -->
-          <_name>Townsville</_name>
+          <name>Townsville</name>
           <coordinates>-19.250000 146.800000</coordinates>
           <location>
             <name>Townsville Airport</name>
@@ -7070,12 +7070,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>South Australia</_name>
+        <name>South Australia</name>
         <fips-code>AS05</fips-code>
         <tz-hint>Australia/Adelaide</tz-hint>
         <city>
           <!-- A city in South Australia in Australia -->
-          <_name>Adelaide</_name>
+          <name>Adelaide</name>
           <coordinates>-34.933333 138.600000</coordinates>
           <location>
             <name>Adelaide Airport</name>
@@ -7086,7 +7086,7 @@
         </city>
         <city>
           <!-- A city in South Australia in Australia -->
-          <_name>Woomera</_name>
+          <name>Woomera</name>
           <coordinates>-31.150000 136.800000</coordinates>
           <location>
             <name>Woomera Airport</name>
@@ -7097,12 +7097,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>Tasmania</_name>
+        <name>Tasmania</name>
         <fips-code>AS06</fips-code>
         <tz-hint>Australia/Hobart</tz-hint>
         <city>
           <!-- A city in Tasmania in Australia -->
-          <_name msgctxt="City in Tasmania, Australia">Hobart</_name>
+          <name msgctxt="City in Tasmania, Australia">Hobart</name>
           <coordinates>-42.916667 147.333333</coordinates>
           <location>
             <name>Hobart Airport</name>
@@ -7113,7 +7113,7 @@
         </city>
         <city>
           <!-- A city in Tasmania in Australia -->
-          <_name>Launceston</_name>
+          <name>Launceston</name>
           <coordinates>-41.450000 147.166667</coordinates>
           <location>
             <name>Launceston Airport</name>
@@ -7124,12 +7124,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name msgctxt="State in Australia">Victoria</_name>
+        <name msgctxt="State in Australia">Victoria</name>
         <fips-code>AS07</fips-code>
         <tz-hint>Australia/Melbourne</tz-hint>
         <city>
           <!-- A city in Victoria in Australia -->
-          <_name>Lara</_name>
+          <name>Lara</name>
           <coordinates>-38.016667 144.400000</coordinates>
           <location>
             <name>Avalon, Avalon Airport</name>
@@ -7139,7 +7139,7 @@
         </city>
         <city>
           <!-- A city in Victoria in Australia -->
-          <_name msgctxt="City in Victoria, Australia">Melbourne</_name>
+          <name msgctxt="City in Victoria, Australia">Melbourne</name>
           <coordinates>-37.816667 144.966667</coordinates>
           <location>
             <name>Melbourne Airport</name>
@@ -7151,12 +7151,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Australia -->
-        <_name>Western Australia</_name>
+        <name>Western Australia</name>
         <fips-code>AS08</fips-code>
         <tz-hint>Australia/Perth</tz-hint>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Broome</_name>
+          <name>Broome</name>
           <coordinates>-17.966667 122.233333</coordinates>
           <location>
             <name>Broome Airport</name>
@@ -7166,7 +7166,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Bullsbrook</_name>
+          <name>Bullsbrook</name>
           <coordinates>-31.666667 116.000000</coordinates>
           <location>
             <name>Bullsbrook Pearce Airport</name>
@@ -7176,7 +7176,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Kalgoorlie</_name>
+          <name>Kalgoorlie</name>
           <coordinates>-30.750000 121.466667</coordinates>
           <location>
             <name>Kalgoorlie Boulder Airport</name>
@@ -7186,7 +7186,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Kununurra</_name>
+          <name>Kununurra</name>
           <coordinates>-15.766667 128.733333</coordinates>
           <location>
             <name>Kununurra Kununurra</name>
@@ -7196,7 +7196,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Learmonth</_name>
+          <name>Learmonth</name>
           <coordinates>-22.250000 114.083333</coordinates>
           <location>
             <name>Learmonth Airport</name>
@@ -7206,7 +7206,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Perth</_name>
+          <name>Perth</name>
           <coordinates>-31.933333 115.833333</coordinates>
           <location>
             <name>Belmont Perth Airport</name>
@@ -7217,7 +7217,7 @@
         </city>
         <city>
           <!-- A city in Western Australia in Australia -->
-          <_name>Shellborough</_name>
+          <name>Shellborough</name>
           <coordinates>-20.016667 119.366667</coordinates>
           <location>
             <name>Port Hedland Pardoo</name>
@@ -7231,7 +7231,7 @@
       <!-- IO - British Indian Ocean Territory, which is exactly what
            it sounds like.
         -->
-      <_name>British Indian Ocean Territory</_name>
+      <name>British Indian Ocean Territory</name>
       <!-- Could not find cities for the following weather stations:
            FJDG - Diego Garcia (-7.300000 72.400000)
         -->
@@ -7247,7 +7247,7 @@
            Indian Ocean, not to be confused with various other islands
            of the same name.
         -->
-      <_name>Christmas Island</_name>
+      <name>Christmas Island</name>
       <!-- Could not find information about the following stations,
            which may be in Christmas Island:
            YPGV 
@@ -7260,7 +7260,7 @@
       <tz-hint>Indian/Christmas</tz-hint>
       <city>
         <!-- A city in Christmas Island -->
-        <_name>Drumsite</_name>
+        <name>Drumsite</name>
         <coordinates>-10.433333 105.683333</coordinates>
         <location>
           <name>Christmas Island Airport</name>
@@ -7270,7 +7270,7 @@
       </city>
       <city>
         <!-- The capital of Christmas Island -->
-        <_name>Flying Fish Cove</_name>
+        <name>Flying Fish Cove</name>
         <coordinates>-10.416667 105.716667</coordinates>
         <location>
           <name>Christmas Island Airport</name>
@@ -7284,7 +7284,7 @@
            the Indian Ocean. The "(Keeling)" is to distinguish them
            from other "Cocos Island"s, and is part of the official name.
         -->
-      <_name>Cocos (Keeling) Islands</_name>
+      <name>Cocos (Keeling) Islands</name>
       <iso-code>CC</iso-code>
       <fips-code>CK</fips-code>
       <timezones>
@@ -7293,7 +7293,7 @@
       <tz-hint>Indian/Cocos</tz-hint>
       <city>
         <!-- A city in the Cocos (Keeling) Islands -->
-        <_name>Bantam Village</_name>
+        <name>Bantam Village</name>
         <coordinates>-12.116667 96.883333</coordinates>
         <location>
           <name>Cocos Island Airport</name>
@@ -7305,7 +7305,7 @@
     </country>
     <country>
       <!-- CK - Cook Islands -->
-      <_name>Cook Islands</_name>
+      <name>Cook Islands</name>
       <iso-code>CK</iso-code>
       <fips-code>CW</fips-code>
       <timezones>
@@ -7314,7 +7314,7 @@
       <tz-hint>Pacific/Rarotonga</tz-hint>
       <city>
         <!-- The capital of the Cook Islands -->
-        <_name>Avarua</_name>
+        <name>Avarua</name>
         <coordinates>-21.207778 -159.775000</coordinates>
         <location>
           <name>Rarotonga</name>
@@ -7325,7 +7325,7 @@
     </country>
     <country>
       <!-- FJ - Fiji -->
-      <_name>Fiji</_name>
+      <name>Fiji</name>
       <!-- Could not find weather stations for the following major
            cities:
            Suva
@@ -7341,7 +7341,7 @@
       <!-- PF - French Polynesia, a French territory in the South
            Pacific
         -->
-      <_name>French Polynesia</_name>
+      <name>French Polynesia</name>
       <iso-code>PF</iso-code>
       <fips-code>FP</fips-code>
       <timezones>
@@ -7351,27 +7351,27 @@
                Tahiti). This string is only used in places where
                "French Polynesia" is already clear from context.
             -->
-          <_name>Tahiti / Society Islands</_name>
+          <name>Tahiti / Society Islands</name>
         </timezone>
         <timezone id="Pacific/Marquesas">
           <!-- This refers to the time zone in the Marquesas Islands of
                French Polynesia. This string is only used in places
                where "French Polynesia" is already clear from context.
             -->
-          <_name>Marquesas Islands</_name>
+          <name>Marquesas Islands</name>
         </timezone>
         <timezone id="Pacific/Gambier">
           <!-- This refers to the time zone in the Gambier Islands of
                French Polynesia. This string is only used in places
                where "French Polynesia" is already clear from context.
             -->
-          <_name>Gambier Islands</_name>
+          <name>Gambier Islands</name>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Tahiti</tz-hint>
       <city>
         <!-- The capital of French Polynesia -->
-        <_name>Papeete</_name>
+        <name>Papeete</name>
         <coordinates>-17.533333 -149.566667</coordinates>
         <location>
           <name>Tahiti-Faaa</name>
@@ -7384,7 +7384,7 @@
       <!-- GU - Guam, a territory of the United States in the South
            Pacific.
         -->
-      <_name>Guam</_name>
+      <name>Guam</name>
       <!-- Could not find information about the following stations,
            which may be in Guam:
            PGRO 
@@ -7397,7 +7397,7 @@
       <tz-hint>Pacific/Guam</tz-hint>
       <city>
         <!-- A city in Guam -->
-        <_name>Asatdas</_name>
+        <name>Asatdas</name>
         <coordinates>13.516944 144.863611</coordinates>
         <location>
           <name>Andersen, Mariana Is, Andersen Air Force Base</name>
@@ -7407,7 +7407,7 @@
       </city>
       <city>
         <!-- A city in Guam -->
-        <_name>Hagåtña</_name>
+        <name>Hagåtña</name>
         <coordinates>13.474167 144.747778</coordinates>
         <location>
           <name>Guam International Airport</name>
@@ -7418,7 +7418,7 @@
     </country>
     <country>
       <!-- KI - Kiribati -->
-      <_name>Kiribati</_name>
+      <name>Kiribati</name>
       <!-- Could not find weather stations for the following major
            cities:
            Bairiki, Tarawa
@@ -7431,27 +7431,27 @@
                main island groups of Kiribati. This string is only used
                in places where "Kiribati" is already clear from context.
             -->
-          <_name>Gilbert Islands</_name>
+          <name>Gilbert Islands</name>
         </timezone>
         <timezone id="Pacific/Enderbury">
           <!-- The time zone in the Phoenix Islands, one of the three
                main island groups of Kiribati. This string is only used
                in places where "Kiribati" is already clear from context.
             -->
-          <_name>Phoenix Islands</_name>
+          <name>Phoenix Islands</name>
         </timezone>
         <timezone id="Pacific/Kiritimati">
           <!-- The time zone in the Line Islands, one of the three main
                island groups of Kiribati. This string is only used in
                places where "Kiribati" is already clear from context.
             -->
-          <_name>Line Islands</_name>
+          <name>Line Islands</name>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Tarawa</tz-hint>
       <city>
         <!-- A city in Kiribati -->
-        <_name msgctxt="City in Kiribati">London</_name>
+        <name msgctxt="City in Kiribati">London</name>
         <coordinates>1.983333 -157.466667</coordinates>
         <location>
           <name>Christmas, Cassidy Airport</name>
@@ -7462,7 +7462,7 @@
     </country>
     <country>
       <!-- MH - Marshall Islands -->
-      <_name>Marshall Islands</_name>
+      <name>Marshall Islands</name>
       <!-- Could not find cities for the following weather stations:
            PKWA - Kwajalein, Bucholz AAF, Kwajalein KMR ATOL Airport
            (8.716667 167.733333)
@@ -7478,7 +7478,7 @@
       <tz-hint>Pacific/Majuro</tz-hint>
       <city>
         <!-- The capital of the Marshall Islands -->
-        <_name>Majuro</_name>
+        <name>Majuro</name>
         <coordinates>7.100000 171.383333</coordinates>
         <location>
           <name>Majuro Atoll, Marshall Islands International Airport</name>
@@ -7494,7 +7494,7 @@
     </country>
     <country>
       <!-- FM - Federated States of Micronesia -->
-      <_name>Micronesia, Federated States of</_name>
+      <name>Micronesia, Federated States of</name>
       <!-- Could not find information about the following stations,
            which may be in Micronesia, Federated States of:
            PTKK PTPN PTSA PTYA 
@@ -7509,7 +7509,7 @@
                The string is only used in places where "Micronesia" is
                already clear from context.
             -->
-          <_name>Pohnpei / Kosrae</_name>
+          <name>Pohnpei / Kosrae</name>
           <obsoletes>Pacific/Kosrae</obsoletes>
           <obsoletes>Pacific/Ponape</obsoletes>
         </timezone>
@@ -7519,13 +7519,13 @@
                string is only used in places where "Micronesia" is
                already clear from context.
             -->
-          <_name>Yap / Chuuk</_name>
+          <name>Yap / Chuuk</name>
           <obsoletes>Pacific/Truk</obsoletes>
         </timezone>
       </timezones>
       <city>
         <!-- The capital of the Federated States of Micronesia -->
-        <_name>Palikir</_name>
+        <name>Palikir</name>
         <coordinates>6.916667 158.150000</coordinates>
         <location>
           <name>Pohnpei</name>
@@ -7537,7 +7537,7 @@
     </country>
     <country>
       <!-- NR - Nauru -->
-      <_name>Nauru</_name>
+      <name>Nauru</name>
       <iso-code>NR</iso-code>
       <fips-code>NR</fips-code>
       <timezones>
@@ -7549,7 +7549,7 @@
       <!-- NC - New Caledonia, a French territory in the South Pacific.
            The French name is "Nouvelle-Calédonie".
         -->
-      <_name>New Caledonia</_name>
+      <name>New Caledonia</name>
       <iso-code>NC</iso-code>
       <fips-code>NC</fips-code>
       <timezones>
@@ -7558,7 +7558,7 @@
       <tz-hint>Pacific/Noumea</tz-hint>
       <city>
         <!-- A city in New Caledonia -->
-        <_name>Karenga</_name>
+        <name>Karenga</name>
         <coordinates>-22.016667 166.233333</coordinates>
         <location>
           <name>La Tontouta</name>
@@ -7568,7 +7568,7 @@
       </city>
       <city>
         <!-- The capital of New Caledonia -->
-        <_name>Nouméa</_name>
+        <name>Nouméa</name>
         <coordinates>-22.266667 166.450000</coordinates>
         <location>
           <name>La Tontouta</name>
@@ -7579,7 +7579,7 @@
     </country>
     <country>
       <!-- NZ - New Zealand -->
-      <_name>New Zealand</_name>
+      <name>New Zealand</name>
       <iso-code>NZ</iso-code>
       <fips-code>NZ</fips-code>
       <timezones>
@@ -7591,19 +7591,19 @@
                there a better name for this? "Mainland" seems odd in
                reference to an island nation...
             -->
-          <_name>Mainland New Zealand</_name>
+          <name>Mainland New Zealand</name>
         </timezone>
         <timezone id="Pacific/Chatham">
           <!-- This refers to the time zone in the Chatham Islands of
                New Zealand.
             -->
-          <_name>Chatham Islands</_name>
+          <name>Chatham Islands</name>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Auckland</tz-hint>
       <city>
         <!-- A city in New Zealand -->
-        <_name>Auckland</_name>
+        <name>Auckland</name>
         <coordinates>-36.866667 174.766667</coordinates>
         <location>
           <name>Auckland Airport</name>
@@ -7613,7 +7613,7 @@
       </city>
       <city>
         <!-- A city in New Zealand -->
-        <_name>Christchurch</_name>
+        <name>Christchurch</name>
         <coordinates>-43.533333 172.633333</coordinates>
         <location>
           <name>Christchurch</name>
@@ -7623,7 +7623,7 @@
       </city>
       <city>
         <!-- A city in New Zealand -->
-        <_name>Dunedin</_name>
+        <name>Dunedin</name>
         <coordinates>-45.8741 170.5035</coordinates>
         <location>
           <name>Dunedin Airport</name>
@@ -7633,7 +7633,7 @@
       </city>
       <city>
         <!-- The capital of New Zealand -->
-        <_name>Wellington</_name>
+        <name>Wellington</name>
         <coordinates>-41.300000 174.783333</coordinates>
         <location>
           <name>Wellington Airport</name>
@@ -7644,7 +7644,7 @@
     </country>
     <country>
       <!-- NU - Niue -->
-      <_name>Niue</_name>
+      <name>Niue</name>
       <iso-code>NU</iso-code>
       <fips-code>NE</fips-code>
       <timezones>
@@ -7653,7 +7653,7 @@
       <tz-hint>Pacific/Niue</tz-hint>
       <city>
         <!-- The capital of Niue -->
-        <_name>Alofi</_name>
+        <name>Alofi</name>
         <coordinates>-19.016667 -169.916667</coordinates>
         <location>
           <name>Alofi / Niue</name>
@@ -7664,7 +7664,7 @@
     </country>
     <country>
       <!-- NF - Norfolk Island, a territory of Australia -->
-      <_name>Norfolk Island</_name>
+      <name>Norfolk Island</name>
       <iso-code>NF</iso-code>
       <fips-code>NF</fips-code>
       <timezones>
@@ -7673,7 +7673,7 @@
       <tz-hint>Pacific/Norfolk</tz-hint>
       <city>
         <!-- A city in Norfolk Island -->
-        <_name msgctxt="City in Norfolk Island">Kingston</_name>
+        <name msgctxt="City in Norfolk Island">Kingston</name>
         <coordinates>-29.050000 167.950000</coordinates>
         <location>
           <name>Norfolk Island Airport</name>
@@ -7687,7 +7687,7 @@
       <!-- MP - Northern Mariana Islands, a semi-independent territory
            of the United States in the western Pacific Ocean.
         -->
-      <_name>Northern Mariana Islands</_name>
+      <name>Northern Mariana Islands</name>
       <iso-code>MP</iso-code>
       <fips-code>US69</fips-code>
       <timezones>
@@ -7696,7 +7696,7 @@
       <tz-hint>Pacific/Saipan</tz-hint>
       <city>
         <!-- A city in the Northern Mariana Islands -->
-        <_name>Chalan Kanoa</_name>
+        <name>Chalan Kanoa</name>
         <coordinates>15.145556 145.699167</coordinates>
         <location>
           <name>Saipan Island, Saipan International Airport</name>
@@ -7712,7 +7712,7 @@
     </country>
     <country>
       <!-- PW - Palau -->
-      <_name>Palau</_name>
+      <name>Palau</name>
       <iso-code>PW</iso-code>
       <fips-code>PS|US70</fips-code>
       <timezones>
@@ -7721,7 +7721,7 @@
       <tz-hint>Pacific/Palau</tz-hint>
       <city>
         <!-- The capital of Palau -->
-        <_name>Koror</_name>
+        <name>Koror</name>
         <coordinates>7.333333 134.483333</coordinates>
         <location>
           <name>Koror, Palau</name>
@@ -7736,7 +7736,7 @@
       </city>
       <city>
         <!-- The capital of Palau -->
-        <_name>Melekeok</_name>
+        <name>Melekeok</name>
         <coordinates>7.493333 134.634167</coordinates>
         <location>
           <name>Babelthuap Island, Babelthuap / Koror Airport</name>
@@ -7747,7 +7747,7 @@
     </country>
     <country>
       <!-- PG - Papua New Guinea -->
-      <_name>Papua New Guinea</_name>
+      <name>Papua New Guinea</name>
       <!-- Could not find information about the following stations,
            which may be in Papua New Guinea:
            AYGN 
@@ -7760,7 +7760,7 @@
       <tz-hint>Pacific/Port_Moresby</tz-hint>
       <city>
         <!-- The capital of Papua New Guinea -->
-        <_name>Port Moresby</_name>
+        <name>Port Moresby</name>
         <coordinates>-9.464722 147.192500</coordinates>
         <location>
           <name>Moresby</name>
@@ -7771,7 +7771,7 @@
     </country>
     <country>
       <!-- PN - Pitcairn, a British territory in the South Pacific -->
-      <_name>Pitcairn</_name>
+      <name>Pitcairn</name>
       <!-- Could not find weather stations for the following major
            cities:
            Adamstown
@@ -7787,7 +7787,7 @@
       <!-- WS - Samoa, an independent nation not to be confused with
            "American Samoa"
         -->
-      <_name>Samoa</_name>
+      <name>Samoa</name>
       <iso-code>WS</iso-code>
       <fips-code>WS</fips-code>
       <timezones>
@@ -7796,7 +7796,7 @@
       <tz-hint>Pacific/Apia</tz-hint>
       <city>
         <!-- The capital of Samoa -->
-        <_name>Apia</_name>
+        <name>Apia</name>
         <coordinates>-13.833333 -171.733333</coordinates>
         <location>
           <name>Faleolo International / Apia</name>
@@ -7807,7 +7807,7 @@
     </country>
     <country>
       <!-- SB - Solomon Islands -->
-      <_name>Solomon Islands</_name>
+      <name>Solomon Islands</name>
       <iso-code>SB</iso-code>
       <fips-code>BP</fips-code>
       <timezones>
@@ -7816,7 +7816,7 @@
       <tz-hint>Pacific/Guadalcanal</tz-hint>
       <city>
         <!-- The capital of the Solomon Islands -->
-        <_name>Honiara</_name>
+        <name>Honiara</name>
         <coordinates>-9.433333 159.950000</coordinates>
         <location>
           <name>Henderson Airport</name>
@@ -7827,7 +7827,7 @@
     </country>
     <country>
       <!-- TL - Timor-Leste (formerly known as "East Timor") -->
-      <_name>Timor-Leste</_name>
+      <name>Timor-Leste</name>
       <iso-code>TL</iso-code>
       <fips-code>TT</fips-code>
       <timezones>
@@ -7837,7 +7837,7 @@
     </country>
     <country>
       <!-- TK - Tokelau, a territory of New Zealand -->
-      <_name>Tokelau</_name>
+      <name>Tokelau</name>
       <iso-code>TK</iso-code>
       <fips-code>TL</fips-code>
       <timezones>
@@ -7847,7 +7847,7 @@
     </country>
     <country>
       <!-- TO - Tonga -->
-      <_name>Tonga</_name>
+      <name>Tonga</name>
       <iso-code>TO</iso-code>
       <fips-code>TN</fips-code>
       <timezones>
@@ -7856,7 +7856,7 @@
       <tz-hint>Pacific/Tongatapu</tz-hint>
       <city>
         <!-- A city in Tonga -->
-        <_name>Fua'amotu</_name>
+        <name>Fua'amotu</name>
         <coordinates>-21.250000 -175.133333</coordinates>
         <location>
           <name>Fua'amotu</name>
@@ -7866,7 +7866,7 @@
       </city>
       <city>
         <!-- The capital of Tonga -->
-        <_name>Nuku'alofa</_name>
+        <name>Nuku'alofa</name>
         <coordinates>-21.133333 -175.200000</coordinates>
         <location>
           <name>Fua'amotu</name>
@@ -7877,7 +7877,7 @@
     </country>
     <country>
       <!-- TV - Tuvalu -->
-      <_name>Tuvalu</_name>
+      <name>Tuvalu</name>
       <iso-code>TV</iso-code>
       <fips-code>TV</fips-code>
       <timezones>
@@ -7886,7 +7886,7 @@
       <tz-hint>Pacific/Funafuti</tz-hint>
       <city>
         <!-- The capital of Tuvalu -->
-        <_name>Funafuti</_name>
+        <name>Funafuti</name>
         <coordinates>-8.516667 179.216667</coordinates>
         <location>
           <name>Funafuti</name>
@@ -7900,7 +7900,7 @@
            mostly-uninhabited United States territories in the South
            Pacific.
         -->
-      <_name>United States Minor Outlying Islands</_name>
+      <name>United States Minor Outlying Islands</name>
       <iso-code>UM</iso-code>
       <fips-code>US74</fips-code>
       <timezones>
@@ -7911,7 +7911,7 @@
                places where "US Minor Outlying Islands" is already
                clear from context.
             -->
-          <_name>Johnston Atoll (Hawaii Time)</_name>
+          <name>Johnston Atoll (Hawaii Time)</name>
         </timezone>
         <timezone id="Pacific/Midway">
           <!-- The time zone for the Midway Atoll in the United States
@@ -7921,7 +7921,7 @@
                places where "US Minor Outlying Islands" is already
                clear from context.
             -->
-          <_name>Midway Atoll (Samoa Time)</_name>
+          <name>Midway Atoll (Samoa Time)</name>
         </timezone>
         <timezone id="Pacific/Wake">
           <!-- The time zone for Wake Island in the United States Minor
@@ -7929,12 +7929,12 @@
                where "US Minor Outlying Islands" is already clear from
                context.
             -->
-          <_name>Wake Island</_name>
+          <name>Wake Island</name>
         </timezone>
       </timezones>
       <city>
         <!-- A city in the United States Minor Outlying Islands -->
-        <_name>Wake Island, Wake Island Army Airfield Airport</_name>
+        <name>Wake Island, Wake Island Army Airfield Airport</name>
         <coordinates>19.283333 166.650000</coordinates>
         <location>
           <name>Wake Island, Wake Island Army Airfield Airport</name>
@@ -7945,7 +7945,7 @@
     </country>
     <country>
       <!-- VU - Vanuatu -->
-      <_name>Vanuatu</_name>
+      <name>Vanuatu</name>
       <!-- Could not find weather stations for the following major
            cities:
            Port-Vila
@@ -7961,7 +7961,7 @@
       <!-- WF - Wallis and Futuna, a French territory in the South
            Pacific
         -->
-      <_name>Wallis and Futuna</_name>
+      <name>Wallis and Futuna</name>
       <iso-code>WF</iso-code>
       <fips-code>WF</fips-code>
       <timezones>
@@ -7970,7 +7970,7 @@
       <tz-hint>Pacific/Wallis</tz-hint>
       <city>
         <!-- A city in Wallis and Futuna -->
-        <_name>Mata'utu</_name>
+        <name>Mata'utu</name>
         <coordinates>-13.283333 -176.133333</coordinates>
         <location>
           <name>Hihifo Ile Wallis</name>
@@ -7981,10 +7981,10 @@
     </country>
   </region>
   <region>
-    <_name>Central and South America</_name>
+    <name>Central and South America</name>
     <country>
       <!-- AR - Argentina -->
-      <_name>Argentina</_name>
+      <name>Argentina</name>
       <iso-code>AR</iso-code>
       <fips-code>AR</fips-code>
       <timezones>
@@ -8004,7 +8004,7 @@
       <tz-hint>America/Argentina/Buenos_Aires</tz-hint>
       <city>
         <!-- The capital of Argentina -->
-        <_name>Buenos Aires</_name>
+        <name>Buenos Aires</name>
         <coordinates>-34.587500 -58.672500</coordinates>
         <location>
           <name>Jorge Newbery Airport</name>
@@ -8014,7 +8014,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Comodoro Rivadavia</_name>
+        <name>Comodoro Rivadavia</name>
         <coordinates>-45.866667 -67.500000</coordinates>
         <location>
           <name>Comodoro Rivadavia Airport</name>
@@ -8024,7 +8024,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Corrientes</_name>
+        <name>Corrientes</name>
         <coordinates>-27.466667 -58.833333</coordinates>
         <location>
           <name>Corrientes Airport</name>
@@ -8034,7 +8034,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name msgctxt="City in Argentina">Córdoba</_name>
+        <name msgctxt="City in Argentina">Córdoba</name>
         <coordinates>-31.400000 -64.183333</coordinates>
         <location>
           <name>Córdoba Airport</name>
@@ -8044,7 +8044,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>El Palomar</_name>
+        <name>El Palomar</name>
         <coordinates>-34.541667 -58.615278</coordinates>
         <location>
           <name>El Palomar Airport</name>
@@ -8054,7 +8054,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Ezeiza</_name>
+        <name>Ezeiza</name>
         <coordinates>-34.838056 -58.517222</coordinates>
         <location>
           <name>Ezeiza Airport</name>
@@ -8064,7 +8064,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Formosa</_name>
+        <name>Formosa</name>
         <coordinates>-26.183333 -58.183333</coordinates>
         <location>
           <name>Formosa Airport</name>
@@ -8074,7 +8074,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Mar del Plata</_name>
+        <name>Mar del Plata</name>
         <coordinates>-38.000000 -57.550000</coordinates>
         <location>
           <name>Mar del Plata Airport</name>
@@ -8084,7 +8084,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Mendoza</_name>
+        <name>Mendoza</name>
         <coordinates>-32.883333 -68.816667</coordinates>
         <location>
           <name>Mendoza Airport</name>
@@ -8094,7 +8094,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Neuquén</_name>
+        <name>Neuquén</name>
         <coordinates>-38.950000 -68.066667</coordinates>
         <location>
           <name>Neuquén Airport</name>
@@ -8104,7 +8104,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Posadas</_name>
+        <name>Posadas</name>
         <coordinates>-27.383333 -55.883333</coordinates>
         <location>
           <name>Posadas Airport</name>
@@ -8114,7 +8114,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Puerto Iguazú</_name>
+        <name>Puerto Iguazú</name>
         <coordinates>-25.566667 -54.566667</coordinates>
         <location>
           <name>Puerto Iguazú Airport</name>
@@ -8124,7 +8124,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Reconquista</_name>
+        <name>Reconquista</name>
         <coordinates>-29.150000 -59.650000</coordinates>
         <location>
           <name>Reconquista</name>
@@ -8134,7 +8134,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Resistencia</_name>
+        <name>Resistencia</name>
         <coordinates>-27.450000 -58.983333</coordinates>
         <location>
           <name>Resistencia Airport</name>
@@ -8144,7 +8144,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Rosario</_name>
+        <name>Rosario</name>
         <coordinates>-32.951111 -60.666389</coordinates>
         <location>
           <name>Rosario Airport</name>
@@ -8154,7 +8154,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Río Gallegos</_name>
+        <name>Río Gallegos</name>
         <coordinates>-51.633333 -69.216667</coordinates>
         <location>
           <name>Río Gallegos Airport</name>
@@ -8164,7 +8164,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Río Grande</_name>
+        <name>Río Grande</name>
         <coordinates>-53.783333 -67.700000</coordinates>
         <location>
           <name>Rio Grande B. A.</name>
@@ -8174,7 +8174,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Salta</_name>
+        <name>Salta</name>
         <coordinates>-24.783333 -65.416667</coordinates>
         <location>
           <name>Salta Airport</name>
@@ -8184,7 +8184,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>San Carlos de Bariloche</_name>
+        <name>San Carlos de Bariloche</name>
         <coordinates>-41.150000 -71.300000</coordinates>
         <location>
           <name>San Carlos de Bariloche Airport</name>
@@ -8194,7 +8194,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name msgctxt="City in Argentina">San Fernando</_name>
+        <name msgctxt="City in Argentina">San Fernando</name>
         <coordinates>-34.444167 -58.577500</coordinates>
         <location>
           <name>San Fernando</name>
@@ -8204,7 +8204,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>San Salvador de Jujuy</_name>
+        <name>San Salvador de Jujuy</name>
         <coordinates>-24.183333 -65.300000</coordinates>
         <location>
           <name>San Salvador de Jujuy Airport</name>
@@ -8214,7 +8214,7 @@
       </city>
       <city>
         <!-- A city in Argentina -->
-        <_name>Ushuaia</_name>
+        <name>Ushuaia</name>
         <coordinates>-54.800000 -68.300000</coordinates>
         <location>
           <name>Ushuaia Airport</name>
@@ -8227,7 +8227,7 @@
       <!-- AW - Aruba, a Caribbean island that is one of the three
            constituent countries of the Kingdom of the Netherlands.
         -->
-      <_name>Aruba</_name>
+      <name>Aruba</name>
       <iso-code>AW</iso-code>
       <fips-code>AA</fips-code>
       <timezones>
@@ -8236,7 +8236,7 @@
       <tz-hint>America/Aruba</tz-hint>
       <city>
         <!-- A city in Aruba -->
-        <_name>Camacuri</_name>
+        <name>Camacuri</name>
         <coordinates>12.500000 -70.016667</coordinates>
         <location>
           <name>Queen Beatrix Airport</name>
@@ -8246,7 +8246,7 @@
       </city>
       <city>
         <!-- The capital of Aruba -->
-        <_name>Oranjestad</_name>
+        <name>Oranjestad</name>
         <coordinates>12.516667 -70.033333</coordinates>
         <location>
           <name>Queen Beatrix Airport</name>
@@ -8257,7 +8257,7 @@
     </country>
     <country>
       <!-- BS - Bahamas -->
-      <_name>Bahamas</_name>
+      <name>Bahamas</name>
       <iso-code>BS</iso-code>
       <fips-code>BF</fips-code>
       <timezones>
@@ -8266,7 +8266,7 @@
       <tz-hint>America/Nassau</tz-hint>
       <city>
         <!-- A city in the Bahamas -->
-        <_name msgctxt="City in Bahamas">Freeport</_name>
+        <name msgctxt="City in Bahamas">Freeport</name>
         <coordinates>26.533333 -78.700000</coordinates>
         <location>
           <name>Freeport, Grand Bahama</name>
@@ -8276,7 +8276,7 @@
       </city>
       <city>
         <!-- A city in the Bahamas -->
-        <_name msgctxt="City in Bahamas">Georgetown</_name>
+        <name msgctxt="City in Bahamas">Georgetown</name>
         <coordinates>23.500000 -75.766667</coordinates>
         <location>
           <name>Georgetown, Exuma</name>
@@ -8286,7 +8286,7 @@
       </city>
       <city>
         <!-- The capital of the Bahamas -->
-        <_name>Nassau</_name>
+        <name>Nassau</name>
         <coordinates>25.083333 -77.350000</coordinates>
         <location>
           <name>Nassau Airport</name>
@@ -8297,7 +8297,7 @@
     </country>
     <country>
       <!-- BZ - Belize -->
-      <_name>Belize</_name>
+      <name>Belize</name>
       <!-- Could not find weather stations for the following major
            cities:
            Belmopan
@@ -8310,7 +8310,7 @@
       <tz-hint>America/Belize</tz-hint>
       <city>
         <!-- A city in Belize -->
-        <_name>Belize City</_name>
+        <name>Belize City</name>
         <coordinates>17.483333 -88.183333</coordinates>
         <location>
           <name>Phillip Goldston International Airport</name>
@@ -8321,7 +8321,7 @@
     </country>
     <country>
       <!-- BO - Bolivia -->
-      <_name>Bolivia</_name>
+      <name>Bolivia</name>
       <iso-code>BO</iso-code>
       <fips-code>BL</fips-code>
       <timezones>
@@ -8330,7 +8330,7 @@
       <tz-hint>America/La_Paz</tz-hint>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Camiri</_name>
+        <name>Camiri</name>
         <coordinates>-20.050000 -63.516667</coordinates>
         <location>
           <name>Camiri</name>
@@ -8340,7 +8340,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Cobija</_name>
+        <name>Cobija</name>
         <coordinates>-11.033333 -68.733333</coordinates>
         <location>
           <name>Cobija</name>
@@ -8350,7 +8350,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Cochabamba</_name>
+        <name>Cochabamba</name>
         <coordinates>-17.383333 -66.150000</coordinates>
         <location>
           <name>Cochabamba</name>
@@ -8360,7 +8360,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name msgctxt="City in Bolivia">Concepción</_name>
+        <name msgctxt="City in Bolivia">Concepción</name>
         <coordinates>-16.133333 -62.033333</coordinates>
         <location>
           <name>Concepción</name>
@@ -8370,7 +8370,7 @@
       </city>
       <city>
         <!-- The capital of Bolivia -->
-        <_name msgctxt="City in Bolivia">La Paz</_name>
+        <name msgctxt="City in Bolivia">La Paz</name>
         <coordinates>-16.500000 -68.150000</coordinates>
         <location>
           <name>Alto Airport</name>
@@ -8380,7 +8380,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Magdalena</_name>
+        <name>Magdalena</name>
         <coordinates>-13.233333 -64.200000</coordinates>
         <location>
           <name>Magdalena</name>
@@ -8390,7 +8390,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Oruro</_name>
+        <name>Oruro</name>
         <coordinates>-17.983333 -67.150000</coordinates>
         <location>
           <name>Oruro</name>
@@ -8400,7 +8400,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Potosí</_name>
+        <name>Potosí</name>
         <coordinates>-19.583611 -65.753056</coordinates>
         <location>
           <name>Potosí</name>
@@ -8410,7 +8410,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Puerto Suárez</_name>
+        <name>Puerto Suárez</name>
         <coordinates>-18.950000 -57.800000</coordinates>
         <location>
           <name>Puerto Suárez</name>
@@ -8420,7 +8420,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Reyes</_name>
+        <name>Reyes</name>
         <coordinates>-14.316667 -67.383333</coordinates>
         <location>
           <name>Reyes</name>
@@ -8430,7 +8430,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Riberalta</_name>
+        <name>Riberalta</name>
         <coordinates>-10.983333 -66.100000</coordinates>
         <location>
           <name>Riberalta</name>
@@ -8440,7 +8440,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Roboré</_name>
+        <name>Roboré</name>
         <coordinates>-18.333333 -59.750000</coordinates>
         <location>
           <name>Roboré</name>
@@ -8450,7 +8450,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Rurrenabaque</_name>
+        <name>Rurrenabaque</name>
         <coordinates>-14.466667 -67.566667</coordinates>
         <location>
           <name>Rurrenabaque</name>
@@ -8460,7 +8460,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>San Borja</_name>
+        <name>San Borja</name>
         <coordinates>-14.816667 -66.850000</coordinates>
         <location>
           <name>San Borja</name>
@@ -8470,7 +8470,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>San Ignacio de Velasco</_name>
+        <name>San Ignacio de Velasco</name>
         <coordinates>-16.366667 -60.950000</coordinates>
         <location>
           <name>San Ignacio de Velasco</name>
@@ -8480,7 +8480,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>San Joaquín</_name>
+        <name>San Joaquín</name>
         <coordinates>-13.066667 -64.816667</coordinates>
         <location>
           <name>San Joaquín</name>
@@ -8492,7 +8492,7 @@
         <!-- A city in Bolivia.
              One of several cities in Bolivia called "San José".
           -->
-        <_name>San José de Chiquitos</_name>
+        <name>San José de Chiquitos</name>
         <coordinates>-17.850000 -60.750000</coordinates>
         <location>
           <name>San José de Chiquitos</name>
@@ -8502,7 +8502,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Santa Ana de Yacuma</_name>
+        <name>Santa Ana de Yacuma</name>
         <coordinates>-13.750000 -65.433333</coordinates>
         <location>
           <name>Santa Ana de Yacuma</name>
@@ -8512,7 +8512,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Santa Cruz</_name>
+        <name>Santa Cruz</name>
         <coordinates>-17.800000 -63.166667</coordinates>
         <location>
           <name>El Trompillo Airport</name>
@@ -8522,7 +8522,7 @@
       </city>
       <city>
         <!-- The capital of Bolivia -->
-        <_name>Sucre</_name>
+        <name>Sucre</name>
         <coordinates>-19.043056 -65.259167</coordinates>
         <location>
           <name>Sucre</name>
@@ -8532,7 +8532,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Tarija</_name>
+        <name>Tarija</name>
         <coordinates>-21.516667 -64.750000</coordinates>
         <location>
           <name>Tarija</name>
@@ -8542,7 +8542,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name msgctxt="City in Bolivia">Trinidad</_name>
+        <name msgctxt="City in Bolivia">Trinidad</name>
         <coordinates>-14.833333 -64.900000</coordinates>
         <location>
           <name>Trinidad</name>
@@ -8552,7 +8552,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Villamontes</_name>
+        <name>Villamontes</name>
         <coordinates>-21.250000 -63.500000</coordinates>
         <location>
           <name>Villamontes</name>
@@ -8562,7 +8562,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Viro Viro</_name>
+        <name>Viro Viro</name>
         <coordinates>-17.650000 -63.133333</coordinates>
         <location>
           <name>Viro Viro</name>
@@ -8572,7 +8572,7 @@
       </city>
       <city>
         <!-- A city in Bolivia -->
-        <_name>Yacuiba</_name>
+        <name>Yacuiba</name>
         <coordinates>-22.033333 -63.683333</coordinates>
         <location>
           <name>Yacuiba</name>
@@ -8583,7 +8583,7 @@
     </country>
     <country>
       <!-- BR - Brazil -->
-      <_name>Brazil</_name>
+      <name>Brazil</name>
       <!-- Could not find cities for the following weather stations:
            SBCJ - Carajas, Maraba Airport (-6.116667 -50.000000)
         -->
@@ -8600,7 +8600,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name>Tocantins</_name>
+          <name>Tocantins</name>
         </timezone>
         <timezone id="America/Bahia">
           <!-- This represents the time zone in the Brazilian state of
@@ -8608,7 +8608,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Bahia</_name>
+          <name msgctxt="Timezone">Bahia</name>
         </timezone>
         <timezone id="America/Belem">
           <!-- This represents the time zone in the Brazilian state of
@@ -8617,7 +8617,7 @@
                used in places where "Brazil" is already clear from
                context.
             -->
-          <_name>Amapá / East Pará</_name>
+          <name>Amapá / East Pará</name>
         </timezone>
         <timezone id="America/Boa_Vista">
           <!-- This represents the time zone in the Brazilian state of
@@ -8625,7 +8625,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Roraima</_name>
+          <name msgctxt="Timezone">Roraima</name>
         </timezone>
         <timezone id="America/Campo_Grande">
           <!-- This represents the time zone in the Brazilian state of
@@ -8633,7 +8633,7 @@
                for more details. This string is only used in places
                where "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Mato Grosso do Sul</_name>
+          <name msgctxt="Timezone">Mato Grosso do Sul</name>
         </timezone>
         <timezone id="America/Cuiaba">
           <!-- This represents the time zone in the Brazilian state of
@@ -8641,7 +8641,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Mato Grosso</_name>
+          <name msgctxt="Timezone">Mato Grosso</name>
         </timezone>
         <timezone id="America/Eirunepe">
           <!-- This represents the time zone in the western part of the
@@ -8650,7 +8650,7 @@
                used in places where "Brazil" is already clear from
                context.
             -->
-          <_name>West Amazonas</_name>
+          <name>West Amazonas</name>
         </timezone>
         <timezone id="America/Fortaleza">
           <!-- This represents the time zone in the Brazilian states of
@@ -8659,7 +8659,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name>Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte</_name>
+          <name>Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte</name>
         </timezone>
         <timezone id="America/Maceio">
           <!-- This represents the time zone in the Brazilian states of
@@ -8667,7 +8667,7 @@
                for more details. This string is only used in places
                where "Brazil" is already clear from context.
             -->
-          <_name>Alagoas, Sergipe</_name>
+          <name>Alagoas, Sergipe</name>
         </timezone>
         <timezone id="America/Manaus">
           <!-- This represents the time zone in the eastern part of the
@@ -8676,7 +8676,7 @@
                used in places where "Brazil" is already clear from
                context.
             -->
-          <_name>East Amazonas</_name>
+          <name>East Amazonas</name>
         </timezone>
         <timezone id="America/Noronha">
           <!-- This represents the time zone on the Brazilian island of
@@ -8684,7 +8684,7 @@
                for more details. This string is only used in places
                where "Brazil" is already clear from context.
             -->
-          <_name>Fernando de Noronha</_name>
+          <name>Fernando de Noronha</name>
         </timezone>
         <timezone id="America/Porto_Velho">
           <!-- This represents the time zone in the Brazilian state of
@@ -8693,7 +8693,7 @@
                used in places where "Brazil" is already clear from
                context.
             -->
-          <_name>West Pará, Rondônia</_name>
+          <name>West Pará, Rondônia</name>
         </timezone>
         <timezone id="America/Recife">
           <!-- This represents the time zone in the Brazilian state of
@@ -8701,7 +8701,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Pernambuco</_name>
+          <name msgctxt="Timezone">Pernambuco</name>
         </timezone>
         <timezone id="America/Rio_Branco">
           <!-- This represents the time zone in the Brazilian state of
@@ -8709,7 +8709,7 @@
                details. This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name msgctxt="Timezone">Acre</_name>
+          <name msgctxt="Timezone">Acre</name>
         </timezone>
         <timezone id="America/Sao_Paulo">
           <!-- This represents the official "base" time zone in Brazil,
@@ -8730,17 +8730,17 @@
                Paulo). This string is only used in places where
                "Brazil" is already clear from context.
             -->
-          <_name>Brasília Time</_name>
+          <name>Brasília Time</name>
         </timezone>
       </timezones>
       <tz-hint>America/Sao_Paulo</tz-hint>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Acre</_name>
+        <name msgctxt="State in Brazil">Acre</name>
         <fips-code>BR01</fips-code>
         <city>
           <!-- A city in Acre in Brazil -->
-          <_name>Cruzeiro do Sul</_name>
+          <name>Cruzeiro do Sul</name>
           <coordinates>-7.633333 -72.600000</coordinates>
           <location>
             <name>Cruzeiro do Sul</name>
@@ -8751,7 +8751,7 @@
         </city>
         <city>
           <!-- A city in Acre in Brazil -->
-          <_name>Rio Branco</_name>
+          <name>Rio Branco</name>
           <coordinates>-9.966667 -67.800000</coordinates>
           <location>
             <name>Rio Branco</name>
@@ -8762,7 +8762,7 @@
         </city>
         <city>
           <!-- A city in Acre in Brazil -->
-          <_name>Tarauacá</_name>
+          <name>Tarauacá</name>
           <coordinates>-8.166667 -70.766667</coordinates>
           <location>
             <name>Tarauacá</name>
@@ -8773,11 +8773,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Alagoas</_name>
+        <name>Alagoas</name>
         <fips-code>BR02</fips-code>
         <city>
           <!-- A city in Alagoas in Brazil -->
-          <_name>Maceió</_name>
+          <name>Maceió</name>
           <coordinates>-9.666667 -35.716667</coordinates>
           <location>
             <name>Maceió Airport</name>
@@ -8789,11 +8789,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Amapá</_name>
+        <name>Amapá</name>
         <fips-code>BR03</fips-code>
         <city>
           <!-- A city in Amapá in Brazil -->
-          <_name>Oiapoque</_name>
+          <name>Oiapoque</name>
           <coordinates>3.833333 -51.833333</coordinates>
           <location>
             <name>Oiapoque</name>
@@ -8804,11 +8804,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Amazonas</_name>
+        <name>Amazonas</name>
         <fips-code>BR04</fips-code>
         <city>
           <!-- A city in Amazonas in Brazil -->
-          <_name>Manaus</_name>
+          <name>Manaus</name>
           <coordinates>-3.113333 -60.025278</coordinates>
           <location>
             <name>Manaus Airport</name>
@@ -8824,7 +8824,7 @@
         </city>
         <city>
           <!-- A city in Amazonas in Brazil -->
-          <_name>Manicoré</_name>
+          <name>Manicoré</name>
           <coordinates>-5.812222 -61.297500</coordinates>
           <location>
             <name>Manicoré</name>
@@ -8834,7 +8834,7 @@
         </city>
         <city>
           <!-- A city in Amazonas in Brazil -->
-          <_name>São Félix</_name>
+          <name>São Félix</name>
           <coordinates>-3.750000 -69.483333</coordinates>
           <location>
             <name>Tabatinga</name>
@@ -8845,7 +8845,7 @@
         </city>
         <city>
           <!-- A city in Amazonas in Brazil -->
-          <_name>São Gabriel</_name>
+          <name>São Gabriel</name>
           <coordinates>-0.133333 -67.083333</coordinates>
           <location>
             <name>São Gabriel</name>
@@ -8855,7 +8855,7 @@
         </city>
         <city>
           <!-- A city in Amazonas in Brazil -->
-          <_name>Tefé</_name>
+          <name>Tefé</name>
           <coordinates>-3.366667 -64.700000</coordinates>
           <location>
             <name>Tefé</name>
@@ -8867,11 +8867,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Bahia</_name>
+        <name msgctxt="State in Brazil">Bahia</name>
         <fips-code>BR05</fips-code>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Bom Jesus da Lapa</_name>
+          <name>Bom Jesus da Lapa</name>
           <coordinates>-13.250000 -43.416667</coordinates>
           <location>
             <name>Bom Jesus da Lapa</name>
@@ -8881,7 +8881,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Feira de Santana</_name>
+          <name>Feira de Santana</name>
           <coordinates>-12.255082 -38.972638</coordinates>
           <location>
             <name>Feira de Santana Airport</name>
@@ -8892,7 +8892,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Ilhéus</_name>
+          <name>Ilhéus</name>
           <coordinates>-14.816667 -39.033333</coordinates>
           <location>
             <name>Ilhéus Airport</name>
@@ -8902,7 +8902,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Paulo Afonso</_name>
+          <name>Paulo Afonso</name>
           <coordinates>-9.350000 -38.233333</coordinates>
           <location>
             <name>Paulo Afonso</name>
@@ -8912,7 +8912,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Pôrto Seguro</_name>
+          <name>Pôrto Seguro</name>
           <coordinates>-16.433333 -39.083333</coordinates>
           <location>
             <name>Pôrto Seguro</name>
@@ -8922,7 +8922,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Salvador</_name>
+          <name>Salvador</name>
           <coordinates>-12.983333 -38.516667</coordinates>
           <location>
             <name>Salvador Airport</name>
@@ -8933,7 +8933,7 @@
         </city>
         <city>
           <!-- A city in Bahia in Brazil -->
-          <_name>Vitória da Conquista</_name>
+          <name>Vitória da Conquista</name>
           <coordinates>-14.850000 -40.850000</coordinates>
           <location>
             <name>Vitória da Conquista</name>
@@ -8944,11 +8944,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Ceará</_name>
+        <name>Ceará</name>
         <fips-code>BR06</fips-code>
         <city>
           <!-- A city in Ceará in Brazil -->
-          <_name>Fortaleza</_name>
+          <name>Fortaleza</name>
           <coordinates>-3.716667 -38.500000</coordinates>
           <location>
             <name>Pinto Martins Airport</name>
@@ -8960,11 +8960,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Distrito Federal</_name>
+        <name msgctxt="State in Brazil">Distrito Federal</name>
         <fips-code>BR07</fips-code>
         <city>
           <!-- The capital of Brazil -->
-          <_name>Brasília</_name>
+          <name>Brasília</name>
           <coordinates>-15.783333 -47.916667</coordinates>
           <location>
             <name>Brasília Airport</name>
@@ -8976,11 +8976,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Espírito Santo</_name>
+        <name>Espírito Santo</name>
         <fips-code>BR08</fips-code>
         <city>
           <!-- A city in Espírito Santo in Brazil -->
-          <_name>Vitória</_name>
+          <name>Vitória</name>
           <coordinates>-20.316667 -40.350000</coordinates>
           <location>
             <name>Vitória Airport</name>
@@ -8992,11 +8992,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Goiás</_name>
+        <name>Goiás</name>
         <fips-code>BR29</fips-code>
         <city>
           <!-- A city in Goiás in Brazil -->
-          <_name>Anápolis</_name>
+          <name>Anápolis</name>
           <coordinates>-16.333333 -48.966667</coordinates>
           <location>
             <name>Anapolis Air Force Base</name>
@@ -9006,7 +9006,7 @@
         </city>
         <city>
           <!-- A city in Goiás in Brazil -->
-          <_name>Goiânia</_name>
+          <name>Goiânia</name>
           <coordinates>-16.666667 -49.266667</coordinates>
           <location>
             <name>Goiânia Airport</name>
@@ -9018,11 +9018,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Maranhão</_name>
+        <name>Maranhão</name>
         <fips-code>BR13</fips-code>
         <city>
           <!-- A city in Maranhão in Brazil -->
-          <_name>Imperatriz</_name>
+          <name>Imperatriz</name>
           <coordinates>-5.533333 -47.483333</coordinates>
           <location>
             <name>Imperatriz</name>
@@ -9032,7 +9032,7 @@
         </city>
         <city>
           <!-- A city in Maranhão in Brazil -->
-          <_name>São Luís</_name>
+          <name>São Luís</name>
           <coordinates>-2.516667 -44.266667</coordinates>
           <location>
             <name>São Luís Airport</name>
@@ -9044,11 +9044,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Mato Grosso</_name>
+        <name msgctxt="State in Brazil">Mato Grosso</name>
         <fips-code>BR14</fips-code>
         <city>
           <!-- A city in Mato Grosso in Brazil -->
-          <_name>Alta Floresta</_name>
+          <name>Alta Floresta</name>
           <coordinates>-9.900000 -55.900000</coordinates>
           <location>
             <name>Alta Floresta Airport</name>
@@ -9058,7 +9058,7 @@
         </city>
         <city>
           <!-- A city in Mato Grosso in Brazil -->
-          <_name>Barra do Garças</_name>
+          <name>Barra do Garças</name>
           <coordinates>-15.883333 -52.250000</coordinates>
           <location>
             <name>Barra do Garças</name>
@@ -9068,7 +9068,7 @@
         </city>
         <city>
           <!-- A city in Mato Grosso in Brazil -->
-          <_name>Cuiabá</_name>
+          <name>Cuiabá</name>
           <coordinates>-15.583333 -56.083333</coordinates>
           <location>
             <name>Cuiabá Airport</name>
@@ -9080,11 +9080,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Mato Grosso do Sul</_name>
+        <name msgctxt="State in Brazil">Mato Grosso do Sul</name>
         <fips-code>BR11</fips-code>
         <city>
           <!-- A city in Mato Grosso do Sul in Brazil -->
-          <_name>Campo Grande</_name>
+          <name>Campo Grande</name>
           <coordinates>-20.450000 -54.616667</coordinates>
           <location>
             <name>Campo Grande Airport</name>
@@ -9095,7 +9095,7 @@
         </city>
         <city>
           <!-- A city in Mato Grosso do Sul in Brazil -->
-          <_name>Corumbá</_name>
+          <name>Corumbá</name>
           <coordinates>-19.016667 -57.650000</coordinates>
           <location>
             <name>Corumbá</name>
@@ -9106,7 +9106,7 @@
         </city>
         <city>
           <!-- A city in Mato Grosso do Sul in Brazil -->
-          <_name>Ponta Porã</_name>
+          <name>Ponta Porã</name>
           <coordinates>-22.533333 -55.716667</coordinates>
           <location>
             <name>Ponta Porã International Airport</name>
@@ -9118,11 +9118,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Minas Gerais</_name>
+        <name>Minas Gerais</name>
         <fips-code>BR15</fips-code>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Barbacena</_name>
+          <name>Barbacena</name>
           <coordinates>-21.233333 -43.766667</coordinates>
           <location>
             <name>Barbacena</name>
@@ -9132,7 +9132,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Belo Horizonte</_name>
+          <name>Belo Horizonte</name>
           <coordinates>-19.916667 -43.933333</coordinates>
           <location>
             <name>Belo Horizonte</name>
@@ -9148,7 +9148,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Juiz de Fora</_name>
+          <name>Juiz de Fora</name>
           <coordinates>-21.751667 -43.352778</coordinates>
           <location>
             <name>Juiz de Fora</name>
@@ -9158,7 +9158,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Montes Claros</_name>
+          <name>Montes Claros</name>
           <coordinates>-16.716667 -43.866667</coordinates>
           <location>
             <name>Montes Claros</name>
@@ -9168,7 +9168,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Poços de Caldas</_name>
+          <name>Poços de Caldas</name>
           <coordinates>-21.800000 -46.566667</coordinates>
           <location>
             <name>Poços de Caldas</name>
@@ -9178,7 +9178,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Uberaba</_name>
+          <name>Uberaba</name>
           <coordinates>-19.750000 -47.916667</coordinates>
           <location>
             <name>Uberaba</name>
@@ -9188,7 +9188,7 @@
         </city>
         <city>
           <!-- A city in Minas Gerais in Brazil -->
-          <_name>Uberlândia</_name>
+          <name>Uberlândia</name>
           <coordinates>-18.916667 -48.300000</coordinates>
           <location>
             <name>Uberlândia</name>
@@ -9199,11 +9199,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Paraná</_name>
+        <name>Paraná</name>
         <fips-code>BR18</fips-code>
         <city>
           <!-- A city in Paraná in Brazil -->
-          <_name>Curitiba</_name>
+          <name>Curitiba</name>
           <coordinates>-25.416667 -49.250000</coordinates>
           <location>
             <name>Curitiba</name>
@@ -9219,7 +9219,7 @@
         </city>
         <city>
           <!-- A city in Paraná in Brazil -->
-          <_name>Foz do Iguaçu</_name>
+          <name>Foz do Iguaçu</name>
           <coordinates>-25.550000 -54.583333</coordinates>
           <location>
             <name>Foz do Iguaçu Airport</name>
@@ -9230,7 +9230,7 @@
         </city>
         <city>
           <!-- A city in Paraná in Brazil -->
-          <_name>Londrina</_name>
+          <name>Londrina</name>
           <coordinates>-23.300000 -51.150000</coordinates>
           <location>
             <name>Londrina Airport</name>
@@ -9241,7 +9241,7 @@
         </city>
         <city>
           <!-- A city in Paraná in Brazil -->
-          <_name>Maringá</_name>
+          <name>Maringá</name>
           <coordinates>-23.416667 -51.916667</coordinates>
           <location>
             <name>Maringá</name>
@@ -9252,11 +9252,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Paraíba</_name>
+        <name>Paraíba</name>
         <fips-code>BR17</fips-code>
         <city>
           <!-- A city in Paraíba in Brazil -->
-          <_name>Campina Grande</_name>
+          <name>Campina Grande</name>
           <coordinates>-7.216667 -35.883333</coordinates>
           <location>
             <name>Campina Grande</name>
@@ -9266,7 +9266,7 @@
         </city>
         <city>
           <!-- A city in Paraíba in Brazil -->
-          <_name>João Pessoa</_name>
+          <name>João Pessoa</name>
           <coordinates>-7.116667 -34.866667</coordinates>
           <location>
             <name>João Pessoa</name>
@@ -9278,11 +9278,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Pará</_name>
+        <name>Pará</name>
         <fips-code>BR16</fips-code>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Altamira</_name>
+          <name>Altamira</name>
           <coordinates>-3.200000 -52.200000</coordinates>
           <location>
             <name>Altamira</name>
@@ -9292,7 +9292,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Belém</_name>
+          <name>Belém</name>
           <coordinates>-1.450000 -48.483333</coordinates>
           <location>
             <name>Belém Airport</name>
@@ -9303,7 +9303,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Cachimbo</_name>
+          <name>Cachimbo</name>
           <coordinates>-8.950000 -54.900000</coordinates>
           <location>
             <name>Cachimbo</name>
@@ -9313,7 +9313,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Conceição do Araguaia</_name>
+          <name>Conceição do Araguaia</name>
           <coordinates>-8.241111 -49.296111</coordinates>
           <location>
             <name>Conceição do Araguaia</name>
@@ -9323,7 +9323,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Itaituba</_name>
+          <name>Itaituba</name>
           <coordinates>-4.216667 -56.016667</coordinates>
           <location>
             <name>Itaituba</name>
@@ -9333,7 +9333,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Jacareacanga</_name>
+          <name>Jacareacanga</name>
           <coordinates>-6.266667 -57.650000</coordinates>
           <location>
             <name>Jacareacanga</name>
@@ -9343,7 +9343,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Marabá</_name>
+          <name>Marabá</name>
           <coordinates>-5.350000 -49.116667</coordinates>
           <location>
             <name>Marabá</name>
@@ -9354,7 +9354,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Piri Grande</_name>
+          <name>Piri Grande</name>
           <coordinates>0.066667 -50.000000</coordinates>
           <location>
             <name>Macapa</name>
@@ -9365,7 +9365,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Santarém</_name>
+          <name>Santarém</name>
           <coordinates>-2.433333 -54.700000</coordinates>
           <location>
             <name>Santarém Airport</name>
@@ -9376,7 +9376,7 @@
         </city>
         <city>
           <!-- A city in Pará in Brazil -->
-          <_name>Tucuruí</_name>
+          <name>Tucuruí</name>
           <coordinates>-3.700000 -49.700000</coordinates>
           <location>
             <name>Tucuruí</name>
@@ -9387,11 +9387,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Pernambuco</_name>
+        <name msgctxt="State in Brazil">Pernambuco</name>
         <fips-code>BR30</fips-code>
         <city>
           <!-- A city in Pernambuco in Brazil -->
-          <_name>Petrolina</_name>
+          <name>Petrolina</name>
           <coordinates>-9.400000 -40.500000</coordinates>
           <location>
             <name>Petrolina</name>
@@ -9401,7 +9401,7 @@
         </city>
         <city>
           <!-- A city in Pernambuco in Brazil -->
-          <_name>Recife</_name>
+          <name>Recife</name>
           <coordinates>-8.050000 -34.900000</coordinates>
           <location>
             <name>Recife Airport</name>
@@ -9412,7 +9412,7 @@
         </city>
         <city>
           <!-- A city in Pernambuco in Brazil -->
-          <_name>Vila dos Remédios</_name>
+          <name>Vila dos Remédios</name>
           <coordinates>-3.850000 -32.400000</coordinates>
           <location>
             <name>Fernando de Noronha</name>
@@ -9424,11 +9424,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Piauí</_name>
+        <name>Piauí</name>
         <fips-code>BR20</fips-code>
         <city>
           <!-- A city in Piauí in Brazil -->
-          <_name>Parnaíba</_name>
+          <name>Parnaíba</name>
           <coordinates>-2.909167 -41.774722</coordinates>
           <location>
             <name>Parnaíba Airport</name>
@@ -9438,7 +9438,7 @@
         </city>
         <city>
           <!-- A city in Piauí in Brazil -->
-          <_name>Teresina</_name>
+          <name>Teresina</name>
           <coordinates>-5.083333 -42.816667</coordinates>
           <location>
             <name>Teresina Airport</name>
@@ -9450,11 +9450,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Rio Grande do Norte</_name>
+        <name>Rio Grande do Norte</name>
         <fips-code>BR22</fips-code>
         <city>
           <!-- A city in Rio Grande do Norte in Brazil -->
-          <_name>Mossoró</_name>
+          <name>Mossoró</name>
           <coordinates>-5.191389 -37.344722</coordinates>
           <location>
             <name>17 Rosado Airport</name>
@@ -9464,7 +9464,7 @@
         </city>
         <city>
           <!-- A city in Rio Grande do Norte in Brazil -->
-          <_name msgctxt="City in Rio Grande do Norte, Brazil">Natal</_name>
+          <name msgctxt="City in Rio Grande do Norte, Brazil">Natal</name>
           <coordinates>-5.783333 -35.216667</coordinates>
           <location>
             <name>Natal Airport</name>
@@ -9476,11 +9476,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Rio Grande do Sul</_name>
+        <name>Rio Grande do Sul</name>
         <fips-code>BR23</fips-code>
         <city>
           <!-- A city in Rio Grande do Sul in Brazil -->
-          <_name>Pelotas</_name>
+          <name>Pelotas</name>
           <coordinates>-31.766667 -52.333333</coordinates>
           <location>
             <name>Pelotas</name>
@@ -9491,7 +9491,7 @@
         </city>
         <city>
           <!-- A city in Rio Grande do Sul in Brazil -->
-          <_name>Porto Alegre</_name>
+          <name>Porto Alegre</name>
           <coordinates>-30.033333 -51.200000</coordinates>
           <location>
             <name>Porto Alegre</name>
@@ -9507,7 +9507,7 @@
         </city>
         <city>
           <!-- A city in Rio Grande do Sul in Brazil -->
-          <_name msgctxt="City in Rio Grande do Sul, Brazil">Santa Maria</_name>
+          <name msgctxt="City in Rio Grande do Sul, Brazil">Santa Maria</name>
           <coordinates>-29.683333 -53.800000</coordinates>
           <location>
             <name>Santa Maria Airport</name>
@@ -9517,7 +9517,7 @@
         </city>
         <city>
           <!-- A city in Rio Grande do Sul in Brazil -->
-          <_name>Uruguaiana</_name>
+          <name>Uruguaiana</name>
           <coordinates>-29.750000 -57.083333</coordinates>
           <location>
             <name>Uruguaiana Airport</name>
@@ -9529,11 +9529,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Rio de Janeiro</_name>
+        <name msgctxt="State in Brazil">Rio de Janeiro</name>
         <fips-code>BR21</fips-code>
         <city>
           <!-- A city in Rio de Janeiro in Brazil -->
-          <_name>Campos</_name>
+          <name>Campos</name>
           <coordinates>-21.750000 -41.300000</coordinates>
           <location>
             <name>Campos</name>
@@ -9543,7 +9543,7 @@
         </city>
         <city>
           <!-- A city in Rio de Janeiro in Brazil -->
-          <_name msgctxt="City in Rio de Janeiro, Brazil">Rio de Janeiro</_name>
+          <name msgctxt="City in Rio de Janeiro, Brazil">Rio de Janeiro</name>
           <coordinates>-22.900000 -43.233333</coordinates>
           <location>
             <name>Rio de Janeiro Airport</name>
@@ -9575,7 +9575,7 @@
         </city>
         <city>
           <!-- A city in Rio de Janeiro in Brazil -->
-          <_name>São Pedro da Aldeia</_name>
+          <name>São Pedro da Aldeia</name>
           <coordinates>-22.850000 -42.100000</coordinates>
           <location>
             <name>S. P. Aldeia Airport</name>
@@ -9586,11 +9586,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Rondônia</_name>
+        <name>Rondônia</name>
         <fips-code>BR24</fips-code>
         <city>
           <!-- A city in Rondônia in Brazil -->
-          <_name>Pôrto Velho</_name>
+          <name>Pôrto Velho</name>
           <coordinates>-8.766667 -63.900000</coordinates>
           <location>
             <name>Pôrto Velho Airport</name>
@@ -9601,7 +9601,7 @@
         </city>
         <city>
           <!-- A city in Rondônia in Brazil -->
-          <_name>Vilhena</_name>
+          <name>Vilhena</name>
           <coordinates>-12.716667 -60.116667</coordinates>
           <location>
             <name>Vilhena Airport</name>
@@ -9613,11 +9613,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">Roraima</_name>
+        <name msgctxt="State in Brazil">Roraima</name>
         <fips-code>BR25</fips-code>
         <city>
           <!-- A city in Roraima in Brazil -->
-          <_name>Boa Vista</_name>
+          <name>Boa Vista</name>
           <coordinates>2.816667 -60.666667</coordinates>
           <location>
             <name>Boa Vista International Airport</name>
@@ -9629,11 +9629,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Santa Catarina</_name>
+        <name>Santa Catarina</name>
         <fips-code>BR26</fips-code>
         <city>
           <!-- A city in Santa Catarina in Brazil -->
-          <_name>Florianópolis</_name>
+          <name>Florianópolis</name>
           <coordinates>-27.583333 -48.566667</coordinates>
           <location>
             <name>Florianópolis Airport</name>
@@ -9645,11 +9645,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Sergipe</_name>
+        <name>Sergipe</name>
         <fips-code>BR28</fips-code>
         <city>
           <!-- A city in Sergipe in Brazil -->
-          <_name>Aracaju</_name>
+          <name>Aracaju</name>
           <coordinates>-10.916667 -37.066667</coordinates>
           <location>
             <name>Aracaju Airport</name>
@@ -9661,11 +9661,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name msgctxt="State in Brazil">São Paulo</_name>
+        <name msgctxt="State in Brazil">São Paulo</name>
         <fips-code>BR27</fips-code>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Bauru</_name>
+          <name>Bauru</name>
           <coordinates>-22.316667 -49.066667</coordinates>
           <location>
             <name>Bauru</name>
@@ -9675,7 +9675,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Campinas</_name>
+          <name>Campinas</name>
           <coordinates>-22.900000 -47.083333</coordinates>
           <location>
             <name>Campinas Airport</name>
@@ -9686,7 +9686,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Guaratinguetá</_name>
+          <name>Guaratinguetá</name>
           <coordinates>-22.816667 -45.216667</coordinates>
           <location>
             <name>Guaratinguetá</name>
@@ -9696,7 +9696,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Guarulhos</_name>
+          <name>Guarulhos</name>
           <coordinates>-23.466667 -46.533333</coordinates>
           <location>
             <name>Guarulhos Airport</name>
@@ -9707,7 +9707,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Palmeiras</_name>
+          <name>Palmeiras</name>
           <coordinates>-21.133333 -47.750000</coordinates>
           <location>
             <name>Leite Lopes, Ribeir Airport</name>
@@ -9718,7 +9718,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Piraçununga</_name>
+          <name>Piraçununga</name>
           <coordinates>-21.983333 -47.416667</coordinates>
           <location>
             <name>Piraçununga</name>
@@ -9728,7 +9728,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Presidente Prudente</_name>
+          <name>Presidente Prudente</name>
           <coordinates>-22.116667 -51.366667</coordinates>
           <location>
             <name>Presidente Prudente</name>
@@ -9738,7 +9738,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>Santos</_name>
+          <name>Santos</name>
           <coordinates>-23.950000 -46.333333</coordinates>
           <location>
             <name>Santos Airport</name>
@@ -9748,7 +9748,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name>São José dos Campos</_name>
+          <name>São José dos Campos</name>
           <coordinates>-23.183333 -45.883333</coordinates>
           <location>
             <name>Sao Jose Dos Campo</name>
@@ -9759,7 +9759,7 @@
         </city>
         <city>
           <!-- A city in São Paulo in Brazil -->
-          <_name msgctxt="City in São Paulo, Brazil">São Paulo</_name>
+          <name msgctxt="City in São Paulo, Brazil">São Paulo</name>
           <coordinates>-23.533333 -46.616667</coordinates>
           <location>
             <name>Marte Airport</name>
@@ -9776,7 +9776,7 @@
       </state>
       <state>
         <!-- A state/province/territory in Brazil -->
-        <_name>Tocantis</_name>
+        <name>Tocantis</name>
         <fips-code>BR31</fips-code>
       </state>
     </country>
@@ -9784,7 +9784,7 @@
       <!-- VG - British Virgin Islands, a British territory in the
            Caribbean
         -->
-      <_name>British Virgin Islands</_name>
+      <name>British Virgin Islands</name>
       <iso-code>VG</iso-code>
       <fips-code>VI</fips-code>
       <timezones>
@@ -9793,7 +9793,7 @@
       <tz-hint>America/Tortola</tz-hint>
       <city>
         <!-- The capital of the British Virgin Islands -->
-        <_name>Road Town</_name>
+        <name>Road Town</name>
         <coordinates>18.416667 -64.616667</coordinates>
         <location>
           <name>Beef Island, Tortola</name>
@@ -9803,7 +9803,7 @@
       </city>
       <city>
         <!-- A city in the British Virgin Islands -->
-        <_name>The Mill</_name>
+        <name>The Mill</name>
         <coordinates>18.450000 -64.533333</coordinates>
         <location>
           <name>Beef Island, Tortola</name>
@@ -9814,7 +9814,7 @@
     </country>
     <country>
       <!-- KY - Cayman Islands, a British territory in the Caribbean -->
-      <_name>Cayman Islands</_name>
+      <name>Cayman Islands</name>
       <iso-code>KY</iso-code>
       <fips-code>CJ</fips-code>
       <timezones>
@@ -9823,7 +9823,7 @@
       <tz-hint>America/Cayman</tz-hint>
       <city>
         <!-- The capital of the Cayman Islands -->
-        <_name msgctxt="City in Cayman Islands">George Town</_name>
+        <name msgctxt="City in Cayman Islands">George Town</name>
         <coordinates>19.300000 -81.383333</coordinates>
         <location>
           <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9833,7 +9833,7 @@
       </city>
       <city>
         <!-- A city in the Cayman Islands -->
-        <_name>Knob Hill</_name>
+        <name>Knob Hill</name>
         <coordinates>19.683333 -79.883333</coordinates>
         <location>
           <name>Gerrard Smith International / Cayman Brac</name>
@@ -9843,7 +9843,7 @@
       </city>
       <city>
         <!-- A city in the Cayman Islands -->
-        <_name>Red Bay Estate</_name>
+        <name>Red Bay Estate</name>
         <coordinates>19.283333 -81.350000</coordinates>
         <location>
           <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9854,7 +9854,7 @@
     </country>
     <country>
       <!-- CL - Chile -->
-      <_name>Chile</_name>
+      <name>Chile</name>
       <!-- Could not find information about the following stations,
            which may be in Chile:
            SCAT SCCF SCJO 
@@ -9866,20 +9866,20 @@
           <!-- This refers to the time zone for mainland Chile (as
                opposed to the time zone for Easter Island).
             -->
-          <_name>Mainland Chile</_name>
+          <name>Mainland Chile</name>
         </timezone>
         <timezone id="Pacific/Easter">
           <!-- This refers to the time zone for Easter Island. The
                string is only used in places where "Chile" is already
                understood from context.
             -->
-          <_name>Easter Island</_name>
+          <name>Easter Island</name>
         </timezone>
       </timezones>
       <tz-hint>America/Santiago</tz-hint>
       <city>
         <!-- A city in Chile -->
-        <_name>Antofagasta</_name>
+        <name>Antofagasta</name>
         <coordinates>-23.650000 -70.400000</coordinates>
         <location>
           <name>Antofagasta</name>
@@ -9889,7 +9889,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Arica</_name>
+        <name>Arica</name>
         <coordinates>-18.483333 -70.333333</coordinates>
         <location>
           <name>Arica</name>
@@ -9899,7 +9899,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Balmaceda</_name>
+        <name>Balmaceda</name>
         <coordinates>-45.916667 -71.683333</coordinates>
         <location>
           <name>Balmaceda</name>
@@ -9909,7 +9909,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name msgctxt="City in Chile">Concepción</_name>
+        <name msgctxt="City in Chile">Concepción</name>
         <coordinates>-36.833333 -73.050000</coordinates>
         <location>
           <name>Concepción</name>
@@ -9919,7 +9919,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Hanga Roa</_name>
+        <name>Hanga Roa</name>
         <coordinates>-27.150000 -109.433333</coordinates>
         <location>
           <name>Isla de Pascua</name>
@@ -9929,7 +9929,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Iquique</_name>
+        <name>Iquique</name>
         <coordinates>-20.216667 -70.166667</coordinates>
         <location>
           <name>Diego Arac Airport</name>
@@ -9939,7 +9939,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>La Serena</_name>
+        <name>La Serena</name>
         <coordinates>-29.907778 -71.254167</coordinates>
         <location>
           <name>La Serena</name>
@@ -9949,7 +9949,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Puerto Montt</_name>
+        <name>Puerto Montt</name>
         <coordinates>-41.471667 -72.936944</coordinates>
         <location>
           <name>Puerto Montt</name>
@@ -9959,7 +9959,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Punta Arenas</_name>
+        <name>Punta Arenas</name>
         <coordinates>-53.150000 -70.916667</coordinates>
         <location>
           <name>Punta Arenas</name>
@@ -9969,7 +9969,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Santa Teresa de Lo Ovalle</_name>
+        <name>Santa Teresa de Lo Ovalle</name>
         <coordinates>-33.383333 -70.783333</coordinates>
         <location>
           <name>Pudahuel</name>
@@ -9979,7 +9979,7 @@
       </city>
       <city>
         <!-- The capital of Chile -->
-        <_name msgctxt="City in Chile">Santiago</_name>
+        <name msgctxt="City in Chile">Santiago</name>
         <coordinates>-33.450000 -70.666667</coordinates>
         <location>
           <name>Pudahuel</name>
@@ -9989,7 +9989,7 @@
       </city>
       <city>
         <!-- A city in Chile -->
-        <_name>Temuco</_name>
+        <name>Temuco</name>
         <coordinates>-38.733333 -72.600000</coordinates>
         <location>
           <name>Temuco</name>
@@ -10000,7 +10000,7 @@
     </country>
     <country>
       <!-- CO - Colombia -->
-      <_name>Colombia</_name>
+      <name>Colombia</name>
       <iso-code>CO</iso-code>
       <fips-code>CO</fips-code>
       <timezones>
@@ -10009,7 +10009,7 @@
       <tz-hint>America/Bogota</tz-hint>
       <city>
         <!-- A city in Colombia -->
-        <_name>Armenia</_name>
+        <name>Armenia</name>
         <coordinates>4.528740 -75.704292</coordinates>
         <location>
           <name>El Eden Airport</name>
@@ -10019,7 +10019,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Barranquilla</_name>
+        <name>Barranquilla</name>
         <coordinates>10.963889 -74.796389</coordinates>
         <location>
           <name>Ernestocortissoz Airport</name>
@@ -10029,7 +10029,7 @@
       </city>
       <city>
         <!-- The capital of Colombia -->
-        <_name>Bogotá</_name>
+        <name>Bogotá</name>
         <coordinates>4.600000 -74.083333</coordinates>
         <location>
           <name>Eldorado Airport</name>
@@ -10039,7 +10039,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Bucaramanga</_name>
+        <name>Bucaramanga</name>
         <coordinates>7.129722 -73.125833</coordinates>
         <location>
           <name>Palonegro Airport</name>
@@ -10049,7 +10049,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Cali</_name>
+        <name>Cali</name>
         <coordinates>3.437222 -76.522500</coordinates>
         <location>
           <name>Alfonso Bonillaaragon Airport</name>
@@ -10059,7 +10059,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Cartagena</_name>
+        <name>Cartagena</name>
         <coordinates>10.399722 -75.514444</coordinates>
         <location>
           <name>Rafael Nunez Airport</name>
@@ -10069,7 +10069,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Cúcuta</_name>
+        <name>Cúcuta</name>
         <coordinates>7.883333 -72.505278</coordinates>
         <location>
           <name>Camilo Daza Airport</name>
@@ -10079,7 +10079,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Ibagué</_name>
+        <name>Ibagué</name>
         <coordinates>4.436428 -75.19165</coordinates>
         <location>
           <name>Perales Airport</name>
@@ -10089,7 +10089,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Ipiales</_name>
+        <name>Ipiales</name>
         <coordinates>0.829810 -77.629761</coordinates>
         <location>
           <name>San Luis Airport</name>
@@ -10099,7 +10099,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Leticia</_name>
+        <name>Leticia</name>
         <coordinates>-4.215278 -69.940556</coordinates>
         <location>
           <name>Vasquez Cobo Airport</name>
@@ -10109,7 +10109,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Medellín</_name>
+        <name>Medellín</name>
         <coordinates>6.251290 -75.575974</coordinates>
         <location>
           <name>Olaya Herrera Airport</name>
@@ -10119,7 +10119,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Monteria</_name>
+        <name>Monteria</name>
         <coordinates>8.759794 -75.887344</coordinates>
         <location>
           <name>Los Garzones Airport</name>
@@ -10129,7 +10129,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Pasto</_name>
+        <name>Pasto</name>
         <coordinates>1.211935 -77.270432</coordinates>
         <location>
           <name>Antonio Nariño Airport</name>
@@ -10139,7 +10139,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Pereira</_name>
+        <name>Pereira</name>
         <coordinates>4.813333 -75.696111</coordinates>
         <location>
           <name>Matecana Airport</name>
@@ -10149,7 +10149,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Popayán</_name>
+        <name>Popayán</name>
         <coordinates>2.445701 -76.603317</coordinates>
         <location>
           <name>Guillermo Leon Valencia Airport</name>
@@ -10159,7 +10159,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Quibdó</_name>
+        <name>Quibdó</name>
         <coordinates>5.692062 -76.655693</coordinates>
         <location>
           <name>El Carano Airport</name>
@@ -10169,7 +10169,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Riohacha</_name>
+        <name>Riohacha</name>
         <coordinates>11.545551 -72.913444</coordinates>
         <location>
           <name>Almirante Padilla Airport</name>
@@ -10179,7 +10179,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Rionegro</_name>
+        <name>Rionegro</name>
         <coordinates>6.155278 -75.388889</coordinates>
         <location>
           <name>J. M. Cordova Airport</name>
@@ -10189,7 +10189,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>San Andrés</_name>
+        <name>San Andrés</name>
         <coordinates>12.584722 -81.700556</coordinates>
         <location>
           <name>San Andres Isla, Sesquicentenario Airport</name>
@@ -10199,7 +10199,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Santa Marta</_name>
+        <name>Santa Marta</name>
         <coordinates>11.248362 -74.204849</coordinates>
         <location>
           <name>Simon Bolivar Airport</name>
@@ -10209,7 +10209,7 @@
       </city>
       <city>
         <!-- A city in Colombia -->
-        <_name>Villavicencio</_name>
+        <name>Villavicencio</name>
         <coordinates>4.157307 -73.637428</coordinates>
         <location>
           <name>Vanguardia Airport</name>
@@ -10220,7 +10220,7 @@
     </country>
     <country>
       <!-- CR - Costa Rica -->
-      <_name>Costa Rica</_name>
+      <name>Costa Rica</name>
       <iso-code>CR</iso-code>
       <fips-code>CS</fips-code>
       <timezones>
@@ -10229,7 +10229,7 @@
       <tz-hint>America/Costa_Rica</tz-hint>
       <city>
         <!-- A city in Costa Rica -->
-        <_name>Alajuela</_name>
+        <name>Alajuela</name>
         <coordinates>10.016667 -84.216667</coordinates>
         <location>
           <name>Juan Santamaria</name>
@@ -10239,7 +10239,7 @@
       </city>
       <city>
         <!-- A city in Costa Rica -->
-        <_name msgctxt="City in Costa Rica">Liberia</_name>
+        <name msgctxt="City in Costa Rica">Liberia</name>
         <coordinates>10.633333 -85.433333</coordinates>
         <location>
           <name>Liberia</name>
@@ -10249,7 +10249,7 @@
       </city>
       <city>
         <!-- A city in Costa Rica -->
-        <_name>Mata de Palo</_name>
+        <name>Mata de Palo</name>
         <coordinates>9.950000 -84.150000</coordinates>
         <location>
           <name>Tobias Bolanos International Airport</name>
@@ -10259,7 +10259,7 @@
       </city>
       <city>
         <!-- A city in Costa Rica -->
-        <_name>Puerto Limón</_name>
+        <name>Puerto Limón</name>
         <coordinates>10.000000 -83.033333</coordinates>
         <location>
           <name>Puerto Limón</name>
@@ -10269,7 +10269,7 @@
       </city>
       <city>
         <!-- The capital of Costa Rica -->
-        <_name>San José</_name>
+        <name>San José</name>
         <coordinates>9.933333 -84.083333</coordinates>
         <location>
           <name>Tobias Bolanos International Airport</name>
@@ -10280,7 +10280,7 @@
     </country>
     <country>
       <!-- CU - Cuba -->
-      <_name>Cuba</_name>
+      <name>Cuba</name>
       <!-- Could not find cities for the following weather stations:
            MUCL - Cayo Largo del Sur (21.616667 -81.550000)
         -->
@@ -10292,7 +10292,7 @@
       <tz-hint>America/Havana</tz-hint>
       <city>
         <!-- A city in Cuba -->
-        <_name>Camagüey</_name>
+        <name>Camagüey</name>
         <coordinates>21.380833 -77.916944</coordinates>
         <location>
           <name>Camagüey Airport</name>
@@ -10302,7 +10302,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name>Cienfuegos</_name>
+        <name>Cienfuegos</name>
         <coordinates>22.146111 -80.435556</coordinates>
         <location>
           <name>Cienfuegos, Las Villas</name>
@@ -10312,7 +10312,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name>Guantánamo</_name>
+        <name>Guantánamo</name>
         <coordinates>20.144444 -75.209167</coordinates>
         <location>
           <name>Leeward Point Field</name>
@@ -10325,7 +10325,7 @@
              "Havana" is the traditional English name.
              The local name in Spanish is "La Habana".
           -->
-        <_name>Havana</_name>
+        <name>Havana</name>
         <coordinates>23.131944 -82.364167</coordinates>
         <location>
           <name>Jose Marti Airport, Rancho Boyeros</name>
@@ -10335,7 +10335,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name>Holguín</_name>
+        <name>Holguín</name>
         <coordinates>20.887222 -76.263056</coordinates>
         <location>
           <name>Holguín Airport</name>
@@ -10345,7 +10345,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name msgctxt="City in Cuba">Manzanillo</_name>
+        <name msgctxt="City in Cuba">Manzanillo</name>
         <coordinates>20.343333 -77.116667</coordinates>
         <location>
           <name>Manzanillo</name>
@@ -10355,7 +10355,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name>Matanzas</_name>
+        <name>Matanzas</name>
         <coordinates>23.041111 -81.577500</coordinates>
         <location>
           <name>Varadero</name>
@@ -10365,7 +10365,7 @@
       </city>
       <city>
         <!-- A city in Cuba -->
-        <_name>Santiago de Cuba</_name>
+        <name>Santiago de Cuba</name>
         <coordinates>20.024722 -75.821944</coordinates>
         <location>
           <name>Santiago de Cuba</name>
@@ -10376,7 +10376,7 @@
     </country>
     <country>
       <!-- DO - Dominican Republic -->
-      <_name>Dominican Republic</_name>
+      <name>Dominican Republic</name>
       <!-- Could not find information about the following stations,
            which may be in Dominican Republic:
            MDCY MDJB 
@@ -10389,7 +10389,7 @@
       <tz-hint>America/Santo_Domingo</tz-hint>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name>Barahona</_name>
+        <name>Barahona</name>
         <coordinates>18.200000 -71.100000</coordinates>
         <location>
           <name>Barahona</name>
@@ -10399,7 +10399,7 @@
       </city>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name>La Romana</_name>
+        <name>La Romana</name>
         <coordinates>18.416667 -68.966667</coordinates>
         <location>
           <name>La Romana International Airport</name>
@@ -10409,7 +10409,7 @@
       </city>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name>Mancha Nueva</_name>
+        <name>Mancha Nueva</name>
         <coordinates>18.433333 -69.683333</coordinates>
         <location>
           <name>Las Americas</name>
@@ -10419,7 +10419,7 @@
       </city>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name>Pantanal</_name>
+        <name>Pantanal</name>
         <coordinates>18.533333 -68.366667</coordinates>
         <location>
           <name>Pantanal</name>
@@ -10429,7 +10429,7 @@
       </city>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name>Puerto Plata</_name>
+        <name>Puerto Plata</name>
         <coordinates>19.800000 -70.683333</coordinates>
         <location>
           <name>Puerto Plata International Airport</name>
@@ -10439,7 +10439,7 @@
       </city>
       <city>
         <!-- A city in the Dominican Republic -->
-        <_name msgctxt="City in Dominican Republic">Santiago</_name>
+        <name msgctxt="City in Dominican Republic">Santiago</name>
         <coordinates>19.450000 -70.700000</coordinates>
         <location>
           <name>Santiago</name>
@@ -10449,7 +10449,7 @@
       </city>
       <city>
         <!-- The capital of the Dominican Republic -->
-        <_name>Santo Domingo</_name>
+        <name>Santo Domingo</name>
         <coordinates>18.466667 -69.900000</coordinates>
         <location>
           <name>Las Americas</name>
@@ -10460,7 +10460,7 @@
     </country>
     <country>
       <!-- EC - Ecuador -->
-      <_name>Ecuador</_name>
+      <name>Ecuador</name>
       <!-- Could not find information about the following stations,
            which may be in Ecuador:
            SESG 
@@ -10472,17 +10472,17 @@
           <!-- This refers to the time zone for mainland Ecuador (as
                opposed to the time zone for the Galapagos Islands).
             -->
-          <_name>Mainland Ecuador</_name>
+          <name>Mainland Ecuador</name>
         </timezone>
         <timezone id="Pacific/Galapagos">
           <!-- The time zone for the Galapagos Islands. -->
-          <_name>Galapagos Islands</_name>
+          <name>Galapagos Islands</name>
         </timezone>
       </timezones>
       <tz-hint>America/Guayaquil</tz-hint>
       <city>
         <!-- A city in Ecuador -->
-        <_name>Guayaquil</_name>
+        <name>Guayaquil</name>
         <coordinates>-2.166667 -79.900000</coordinates>
         <location>
           <name>Simon Bolivar Airport</name>
@@ -10492,7 +10492,7 @@
       </city>
       <city>
         <!-- A city in Ecuador -->
-        <_name>Latacunga</_name>
+        <name>Latacunga</name>
         <coordinates>-0.933333 -78.616667</coordinates>
         <location>
           <name>Latacunga</name>
@@ -10502,7 +10502,7 @@
       </city>
       <city>
         <!-- A city in Ecuador -->
-        <_name>Manta</_name>
+        <name>Manta</name>
         <coordinates>-0.950000 -80.733333</coordinates>
         <location>
           <name>Manta</name>
@@ -10512,7 +10512,7 @@
       </city>
       <city>
         <!-- The capital of Ecuador -->
-        <_name>Quito</_name>
+        <name>Quito</name>
         <coordinates>-0.216667 -78.500000</coordinates>
         <location>
           <name>Mariscal Sucre Airport</name>
@@ -10523,7 +10523,7 @@
     </country>
     <country>
       <!-- SV - El Salvador -->
-      <_name>El Salvador</_name>
+      <name>El Salvador</name>
       <iso-code>SV</iso-code>
       <fips-code>ES</fips-code>
       <timezones>
@@ -10532,7 +10532,7 @@
       <tz-hint>America/El_Salvador</tz-hint>
       <city>
         <!-- A city in El Salvador -->
-        <_name>Comalapa</_name>
+        <name>Comalapa</name>
         <coordinates>13.501111 -89.075833</coordinates>
         <location>
           <name>El Salvador International Airport</name>
@@ -10542,7 +10542,7 @@
       </city>
       <city>
         <!-- A city in El Salvador -->
-        <_name>Ilopango</_name>
+        <name>Ilopango</name>
         <coordinates>13.701667 -89.109444</coordinates>
         <location>
           <name>San Salvador Airport</name>
@@ -10552,7 +10552,7 @@
       </city>
       <city>
         <!-- The capital of El Salvador -->
-        <_name>San Salvador</_name>
+        <name>San Salvador</name>
         <coordinates>13.708611 -89.203056</coordinates>
         <location>
           <name>San Salvador Airport, Ilopango</name>
@@ -10568,7 +10568,7 @@
            Malvinas". The parenthesized form is the compromise used by
            ISO and the UN.)
         -->
-      <_name>Falkland Islands (Malvinas)</_name>
+      <name>Falkland Islands (Malvinas)</name>
       <iso-code>FK</iso-code>
       <fips-code>FK</fips-code>
       <timezones>
@@ -10577,7 +10577,7 @@
       <tz-hint>Atlantic/Stanley</tz-hint>
       <city>
         <!-- The capital of the Falkland Islands (Malvinas) -->
-        <_name msgctxt="City in Falkland Islands (Malvinas)">Stanley</_name>
+        <name msgctxt="City in Falkland Islands (Malvinas)">Stanley</name>
         <coordinates>-51.700000 -57.850000</coordinates>
         <location>
           <name>Mount Pleasant Airport</name>
@@ -10590,7 +10590,7 @@
       <!-- GF - French Guiana, an overseas department of France on the
            northern coast of South America.
         -->
-      <_name>French Guiana</_name>
+      <name>French Guiana</name>
       <iso-code>GF</iso-code>
       <fips-code>FG</fips-code>
       <timezones>
@@ -10599,7 +10599,7 @@
       <tz-hint>America/Cayenne</tz-hint>
       <city>
         <!-- The capital of French Guiana -->
-        <_name>Cayenne</_name>
+        <name>Cayenne</name>
         <coordinates>4.933333 -52.333333</coordinates>
         <location>
           <name>Rochambeau Airport</name>
@@ -10610,7 +10610,7 @@
     </country>
     <country>
       <!-- GD - Grenada -->
-      <_name>Grenada</_name>
+      <name>Grenada</name>
       <iso-code>GD</iso-code>
       <fips-code>GJ</fips-code>
       <timezones>
@@ -10619,7 +10619,7 @@
       <tz-hint>America/Grenada</tz-hint>
       <city>
         <!-- A city in Grenada -->
-        <_name>Bamboo</_name>
+        <name>Bamboo</name>
         <coordinates>12.000000 -61.783333</coordinates>
         <location>
           <name>Point Salines Airport</name>
@@ -10629,7 +10629,7 @@
       </city>
       <city>
         <!-- The capital of Grenada -->
-        <_name>Saint George's</_name>
+        <name>Saint George's</name>
         <coordinates>12.050000 -61.750000</coordinates>
         <location>
           <name>Point Salines Airport</name>
@@ -10642,7 +10642,7 @@
       <!-- GP - Guadeloupe, an overseas department of France in the
            Caribbean.
         -->
-      <_name>Guadeloupe</_name>
+      <name>Guadeloupe</name>
       <iso-code>GP</iso-code>
       <fips-code>GP</fips-code>
       <timezones>
@@ -10651,7 +10651,7 @@
       <tz-hint>America/Guadeloupe</tz-hint>
       <city>
         <!-- The capital of Guadeloupe -->
-        <_name>Basse-Terre</_name>
+        <name>Basse-Terre</name>
         <coordinates>16.000000 -61.716667</coordinates>
         <location>
           <name>Le Raizet, Guadeloupe</name>
@@ -10661,7 +10661,7 @@
       </city>
       <city>
         <!-- A city in Guadeloupe -->
-        <_name>Les Abymes</_name>
+        <name>Les Abymes</name>
         <coordinates>16.266667 -61.500000</coordinates>
         <location>
           <name>Le Raizet, Guadeloupe</name>
@@ -10672,7 +10672,7 @@
     </country>
     <country>
       <!-- GT - Guatemala -->
-      <_name msgctxt="Country">Guatemala</_name>
+      <name msgctxt="Country">Guatemala</name>
       <iso-code>GT</iso-code>
       <fips-code>GT</fips-code>
       <timezones>
@@ -10681,7 +10681,7 @@
       <tz-hint>America/Guatemala</tz-hint>
       <city>
         <!-- The capital of Guatemala -->
-        <_name msgctxt="City in Guatemala">Guatemala</_name>
+        <name msgctxt="City in Guatemala">Guatemala</name>
         <coordinates>14.621111 -90.526944</coordinates>
         <location>
           <name>Guatemala Aurora Airport</name>
@@ -10691,7 +10691,7 @@
       </city>
       <city>
         <!-- A city in Guatemala -->
-        <_name>Huehuetenango</_name>
+        <name>Huehuetenango</name>
         <coordinates>15.319722 -91.470833</coordinates>
         <location>
           <name>Huehuetenango</name>
@@ -10701,7 +10701,7 @@
       </city>
       <city>
         <!-- A city in Guatemala -->
-        <_name>Puerto Barrios</_name>
+        <name>Puerto Barrios</name>
         <coordinates>15.716667 -88.600000</coordinates>
         <location>
           <name>Puerto Barrios</name>
@@ -10711,7 +10711,7 @@
       </city>
       <city>
         <!-- A city in Guatemala -->
-        <_name>Puerto San José</_name>
+        <name>Puerto San José</name>
         <coordinates>13.925556 -90.824444</coordinates>
         <location>
           <name>Puerto San José</name>
@@ -10721,7 +10721,7 @@
       </city>
       <city>
         <!-- A city in Guatemala -->
-        <_name>Retalhuleu</_name>
+        <name>Retalhuleu</name>
         <coordinates>14.533333 -91.683333</coordinates>
         <location>
           <name>Retalhuleu</name>
@@ -10731,7 +10731,7 @@
       </city>
       <city>
         <!-- A city in Guatemala -->
-        <_name>Tikal</_name>
+        <name>Tikal</name>
         <coordinates>17.225000 -89.613333</coordinates>
         <location>
           <name>Tikal</name>
@@ -10742,7 +10742,7 @@
     </country>
     <country>
       <!-- GY - Guyana -->
-      <_name>Guyana</_name>
+      <name>Guyana</name>
       <iso-code>GY</iso-code>
       <fips-code>GY</fips-code>
       <timezones>
@@ -10751,7 +10751,7 @@
       <tz-hint>America/Guyana</tz-hint>
       <city>
         <!-- The capital of Guyana -->
-        <_name msgctxt="City in Guyana">Georgetown</_name>
+        <name msgctxt="City in Guyana">Georgetown</name>
         <coordinates>6.800000 -58.166667</coordinates>
         <location>
           <name>Cheddi Jagan International Airport</name>
@@ -10762,7 +10762,7 @@
     </country>
     <country>
       <!-- HT - Haiti -->
-      <_name>Haiti</_name>
+      <name>Haiti</name>
       <iso-code>HT</iso-code>
       <fips-code>HA</fips-code>
       <timezones>
@@ -10771,7 +10771,7 @@
       <tz-hint>America/Port-au-Prince</tz-hint>
       <city>
         <!-- Capital of Haiti -->
-        <_name>Port-au-Prince</_name>
+        <name>Port-au-Prince</name>
         <coordinates>18.580050 -72.292542</coordinates>
         <location>
           <name>Port-Au-Prince / Aeroport International</name>
@@ -10782,7 +10782,7 @@
     </country>
     <country>
       <!-- HN - Honduras -->
-      <_name>Honduras</_name>
+      <name>Honduras</name>
       <!-- Could not find information about the following stations,
            which may be in Honduras:
            MHTR 
@@ -10795,7 +10795,7 @@
       <tz-hint>America/Tegucigalpa</tz-hint>
       <city>
         <!-- A city in Honduras -->
-        <_name>Amapala</_name>
+        <name>Amapala</name>
         <coordinates>13.292222 -87.653889</coordinates>
         <location>
           <name>Amapala</name>
@@ -10805,7 +10805,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Catacamas</_name>
+        <name>Catacamas</name>
         <coordinates>14.800000 -85.900000</coordinates>
         <location>
           <name>Catacamas</name>
@@ -10815,7 +10815,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Ciudad Choluteca</_name>
+        <name>Ciudad Choluteca</name>
         <coordinates>13.300278 -87.190833</coordinates>
         <location>
           <name>Ciudad Choluteca</name>
@@ -10825,7 +10825,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Comayagua</_name>
+        <name>Comayagua</name>
         <coordinates>14.450000 -87.633333</coordinates>
         <location>
           <name>Coronel Enrique Soto Cano Air Base</name>
@@ -10835,7 +10835,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Guanaja</_name>
+        <name>Guanaja</name>
         <coordinates>16.400000 -85.900000</coordinates>
         <location>
           <name>Guanaja</name>
@@ -10845,7 +10845,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>La Ceiba</_name>
+        <name>La Ceiba</name>
         <coordinates>15.783333 -86.800000</coordinates>
         <location>
           <name>La Ceiba Airport</name>
@@ -10855,7 +10855,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>La Esperanza</_name>
+        <name>La Esperanza</name>
         <coordinates>14.300000 -88.183333</coordinates>
         <location>
           <name>La Esperanza</name>
@@ -10865,7 +10865,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>La Mesa</_name>
+        <name>La Mesa</name>
         <coordinates>15.416667 -87.883333</coordinates>
         <location>
           <name>La Mesa San Pedro Sula</name>
@@ -10875,7 +10875,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Puerto Lempira</_name>
+        <name>Puerto Lempira</name>
         <coordinates>15.266667 -83.766667</coordinates>
         <location>
           <name>Puerto Lempira</name>
@@ -10885,7 +10885,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Roatán</_name>
+        <name>Roatán</name>
         <coordinates>16.300000 -86.550000</coordinates>
         <location>
           <name>Roatán</name>
@@ -10895,7 +10895,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Santa Rosa de Copán</_name>
+        <name>Santa Rosa de Copán</name>
         <coordinates>14.766667 -88.783333</coordinates>
         <location>
           <name>Santa Rosa de Copán</name>
@@ -10905,7 +10905,7 @@
       </city>
       <city>
         <!-- The capital of Honduras -->
-        <_name>Tegucigalpa</_name>
+        <name>Tegucigalpa</name>
         <coordinates>14.100000 -87.216667</coordinates>
         <location>
           <name>Tegucigalpa</name>
@@ -10915,7 +10915,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Tela</_name>
+        <name>Tela</name>
         <coordinates>15.783333 -87.450000</coordinates>
         <location>
           <name>Tela</name>
@@ -10925,7 +10925,7 @@
       </city>
       <city>
         <!-- A city in Honduras -->
-        <_name>Yoro</_name>
+        <name>Yoro</name>
         <coordinates>15.133333 -87.133333</coordinates>
         <location>
           <name>Yoro</name>
@@ -10936,7 +10936,7 @@
     </country>
     <country>
       <!-- JM - Jamaica -->
-      <_name>Jamaica</_name>
+      <name>Jamaica</name>
       <iso-code>JM</iso-code>
       <fips-code>JM</fips-code>
       <timezones>
@@ -10945,7 +10945,7 @@
       <tz-hint>America/Jamaica</tz-hint>
       <city>
         <!-- The capital of Jamaica -->
-        <_name msgctxt="City in Jamaica">Kingston</_name>
+        <name msgctxt="City in Jamaica">Kingston</name>
         <coordinates>18.000000 -76.800000</coordinates>
         <location>
           <name>Norman Manley Airport</name>
@@ -10955,7 +10955,7 @@
       </city>
       <city>
         <!-- A city in Jamaica -->
-        <_name>Montego Bay</_name>
+        <name>Montego Bay</name>
         <coordinates>18.466667 -77.916667</coordinates>
         <location>
           <name>Sangster Airport</name>
@@ -10968,7 +10968,7 @@
       <!-- MQ - Martinique, an overseas department of France in the
            Caribbean.
         -->
-      <_name>Martinique</_name>
+      <name>Martinique</name>
       <iso-code>MQ</iso-code>
       <fips-code>MB</fips-code>
       <timezones>
@@ -10977,7 +10977,7 @@
       <tz-hint>America/Martinique</tz-hint>
       <city>
         <!-- The capital of Martinique -->
-        <_name>Fort-de-France</_name>
+        <name>Fort-de-France</name>
         <coordinates>14.600000 -61.083333</coordinates>
         <location>
           <name>Le Lamentin</name>
@@ -10987,7 +10987,7 @@
       </city>
       <city>
         <!-- A city in Martinique -->
-        <_name>Le Lamentin</_name>
+        <name>Le Lamentin</name>
         <coordinates>14.600000 -61.000000</coordinates>
         <location>
           <name>Le Lamentin</name>
@@ -10998,7 +10998,7 @@
     </country>
     <country>
       <!-- MS - Montserrat, a British territory in the Caribbean. -->
-      <_name>Montserrat</_name>
+      <name>Montserrat</name>
       <!-- Could not find weather stations for the following major
            cities:
            Plymouth
@@ -11015,7 +11015,7 @@
            of the three constituent countries of the Kingdom of the
            Netherlands.
         -->
-      <_name>Netherlands Antilles</_name>
+      <name>Netherlands Antilles</name>
       <iso-code>AN</iso-code>
       <fips-code>NT</fips-code>
       <timezones>
@@ -11024,7 +11024,7 @@
       <tz-hint>America/Curacao</tz-hint>
       <city>
         <!-- A city in the Netherlands Antilles -->
-        <_name>Benners</_name>
+        <name>Benners</name>
         <coordinates>17.483333 -62.983333</coordinates>
         <location>
           <name>Roosevelt Airport, Saint Eustatius</name>
@@ -11034,7 +11034,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands Antilles -->
-        <_name>Cupe Coy</_name>
+        <name>Cupe Coy</name>
         <coordinates>18.050000 -63.133333</coordinates>
         <location>
           <name>Juliana Airport, Saint Maarten</name>
@@ -11044,7 +11044,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands Antilles -->
-        <_name>Dorp Nikiboko</_name>
+        <name>Dorp Nikiboko</name>
         <coordinates>12.150000 -68.266667</coordinates>
         <location>
           <name>Flamingo Airport, Bonaire</name>
@@ -11054,7 +11054,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands Antilles -->
-        <_name>Gato</_name>
+        <name>Gato</name>
         <coordinates>12.166667 -68.966667</coordinates>
         <location>
           <name>Hato Airport, Curacao</name>
@@ -11065,7 +11065,7 @@
     </country>
     <country>
       <!-- NI - Nicaragua -->
-      <_name>Nicaragua</_name>
+      <name>Nicaragua</name>
       <iso-code>NI</iso-code>
       <fips-code>NU</fips-code>
       <timezones>
@@ -11074,7 +11074,7 @@
       <tz-hint>America/Managua</tz-hint>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Bluefields</_name>
+        <name>Bluefields</name>
         <coordinates>12.000000 -83.750000</coordinates>
         <location>
           <name>Bluefields</name>
@@ -11084,7 +11084,7 @@
       </city>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Chinandega</_name>
+        <name>Chinandega</name>
         <coordinates>12.616667 -87.150000</coordinates>
         <location>
           <name>Chinandega</name>
@@ -11094,7 +11094,7 @@
       </city>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Jinotega</_name>
+        <name>Jinotega</name>
         <coordinates>13.100000 -86.000000</coordinates>
         <location>
           <name>Jinotega</name>
@@ -11104,7 +11104,7 @@
       </city>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Juigalpa</_name>
+        <name>Juigalpa</name>
         <coordinates>12.083333 -85.400000</coordinates>
         <location>
           <name>Juigalpa</name>
@@ -11114,7 +11114,7 @@
       </city>
       <city>
         <!-- The capital of Nicaragua -->
-        <_name>Managua</_name>
+        <name>Managua</name>
         <coordinates>12.150833 -86.268333</coordinates>
         <location>
           <name>A. C. Sandino Airport</name>
@@ -11124,7 +11124,7 @@
       </city>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Puerto Cabezas</_name>
+        <name>Puerto Cabezas</name>
         <coordinates>14.033333 -83.383333</coordinates>
         <location>
           <name>Puerto Cabezas</name>
@@ -11134,7 +11134,7 @@
       </city>
       <city>
         <!-- A city in Nicaragua -->
-        <_name>Rivas</_name>
+        <name>Rivas</name>
         <coordinates>11.433333 -85.833333</coordinates>
         <location>
           <name>Rivas</name>
@@ -11147,7 +11147,7 @@
       <!-- PA - Panama. The local (Spanish) name is "Panamá". In common
            English usage (and in ISO 3166) it does not have the accent.
         -->
-      <_name>Panama</_name>
+      <name>Panama</name>
       <iso-code>PA</iso-code>
       <fips-code>PM</fips-code>
       <timezones>
@@ -11156,7 +11156,7 @@
       <tz-hint>America/Panama</tz-hint>
       <city>
         <!-- A city in Panama -->
-        <_name>David</_name>
+        <name>David</name>
         <coordinates>8.433333 -82.433333</coordinates>
         <location>
           <name>David</name>
@@ -11166,7 +11166,7 @@
       </city>
       <city>
         <!-- A city in Panama -->
-        <_name>Fuerte Kobbe</_name>
+        <name>Fuerte Kobbe</name>
         <coordinates>8.916667 -79.583333</coordinates>
         <location>
           <name>Howard Air Force Base</name>
@@ -11176,7 +11176,7 @@
       </city>
       <city>
         <!-- The capital of Panama -->
-        <_name>Panamá</_name>
+        <name>Panamá</name>
         <coordinates>8.966667 -79.533333</coordinates>
         <location>
           <name>Howard Air Force Base</name>
@@ -11186,7 +11186,7 @@
       </city>
       <city>
         <!-- A city in Panama -->
-        <_name>Tocumen</_name>
+        <name>Tocumen</name>
         <coordinates>9.083333 -79.383333</coordinates>
         <location>
           <name>Tocumen</name>
@@ -11197,7 +11197,7 @@
     </country>
     <country>
       <!-- PY - Paraguay -->
-      <_name>Paraguay</_name>
+      <name>Paraguay</name>
       <iso-code>PY</iso-code>
       <fips-code>PA</fips-code>
       <timezones>
@@ -11206,7 +11206,7 @@
       <tz-hint>America/Asuncion</tz-hint>
       <city>
         <!-- The capital of Paraguay -->
-        <_name>Asunción</_name>
+        <name>Asunción</name>
         <coordinates>-25.266667 -57.666667</coordinates>
         <location>
           <name>Asunción Airport</name>
@@ -11216,7 +11216,7 @@
       </city>
       <city>
         <!-- A city in Paraguay -->
-        <_name>Colonia Félix de Azara</_name>
+        <name>Colonia Félix de Azara</name>
         <coordinates>-25.483333 -54.766667</coordinates>
         <location>
           <name>Guarany Airport</name>
@@ -11227,7 +11227,7 @@
     </country>
     <country>
       <!-- PE - Peru -->
-      <_name msgctxt="Country">Peru</_name>
+      <name msgctxt="Country">Peru</name>
       <iso-code>PE</iso-code>
       <fips-code>PE</fips-code>
       <timezones>
@@ -11236,7 +11236,7 @@
       <tz-hint>America/Lima</tz-hint>
       <city>
         <!-- A city in Peru -->
-        <_name>Andahuaylas</_name>
+        <name>Andahuaylas</name>
         <coordinates>-13.655556 -73.387222</coordinates>
         <location>
           <name>Andahuaylas</name>
@@ -11246,7 +11246,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Arequipa</_name>
+        <name>Arequipa</name>
         <coordinates>-16.398889 -71.535000</coordinates>
         <location>
           <name>Arequipa</name>
@@ -11256,7 +11256,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Ayacucho</_name>
+        <name>Ayacucho</name>
         <coordinates>-13.158333 -74.223889</coordinates>
         <location>
           <name>Ayacucho</name>
@@ -11266,7 +11266,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Chiclayo</_name>
+        <name>Chiclayo</name>
         <coordinates>-6.773611 -79.841667</coordinates>
         <location>
           <name>Chiclayo</name>
@@ -11276,7 +11276,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Cusco</_name>
+        <name>Cusco</name>
         <coordinates>-13.518333 -71.978056</coordinates>
         <location>
           <name>Cusco</name>
@@ -11286,7 +11286,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Iquitos</_name>
+        <name>Iquitos</name>
         <coordinates>-3.748056 -73.247222</coordinates>
         <location>
           <name>Iquitos</name>
@@ -11296,7 +11296,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Juliaca</_name>
+        <name>Juliaca</name>
         <coordinates>-15.500000 -70.133333</coordinates>
         <location>
           <name>Juliaca</name>
@@ -11306,7 +11306,7 @@
       </city>
       <city>
         <!-- The capital of Peru -->
-        <_name msgctxt="City in Peru">Lima</_name>
+        <name msgctxt="City in Peru">Lima</name>
         <coordinates>-12.050000 -77.050000</coordinates>
         <location>
           <name>Lima-Callao, Jorge Chavez International Airport</name>
@@ -11316,7 +11316,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Pisco</_name>
+        <name>Pisco</name>
         <coordinates>-13.700000 -76.216667</coordinates>
         <location>
           <name>Pisco</name>
@@ -11326,7 +11326,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Pucallpa</_name>
+        <name>Pucallpa</name>
         <coordinates>-8.382500 -74.538056</coordinates>
         <location>
           <name>Pucallpa</name>
@@ -11336,7 +11336,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Puerto Maldonado</_name>
+        <name>Puerto Maldonado</name>
         <coordinates>-12.600000 -69.183333</coordinates>
         <location>
           <name>Puerto Maldonado</name>
@@ -11346,7 +11346,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Tacna</_name>
+        <name>Tacna</name>
         <coordinates>-17.994722 -70.241111</coordinates>
         <location>
           <name>Tacna</name>
@@ -11356,7 +11356,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Talara</_name>
+        <name>Talara</name>
         <coordinates>-4.577222 -81.271944</coordinates>
         <location>
           <name>Talara</name>
@@ -11366,7 +11366,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Tarapoto</_name>
+        <name>Tarapoto</name>
         <coordinates>-6.501389 -76.365556</coordinates>
         <location>
           <name>Tarapoto</name>
@@ -11376,7 +11376,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Trujillo</_name>
+        <name>Trujillo</name>
         <coordinates>-8.111944 -79.025556</coordinates>
         <location>
           <name>Trujillo</name>
@@ -11386,7 +11386,7 @@
       </city>
       <city>
         <!-- A city in Peru -->
-        <_name>Tumbes</_name>
+        <name>Tumbes</name>
         <coordinates>-3.566667 -80.441389</coordinates>
         <location>
           <name>Tumbes</name>
@@ -11397,7 +11397,7 @@
     </country>
     <country>
       <!-- LC - Saint Lucia -->
-      <_name>Saint Lucia</_name>
+      <name>Saint Lucia</name>
       <iso-code>LC</iso-code>
       <fips-code>ST</fips-code>
       <timezones>
@@ -11406,7 +11406,7 @@
       <tz-hint>America/St_Lucia</tz-hint>
       <city>
         <!-- The capital of Saint Lucia -->
-        <_name>Castries</_name>
+        <name>Castries</name>
         <coordinates>14.000000 -61.000000</coordinates>
         <location>
           <name>Vigie</name>
@@ -11416,7 +11416,7 @@
       </city>
       <city>
         <!-- A city in Saint Lucia -->
-        <_name>Pointe Sable</_name>
+        <name>Pointe Sable</name>
         <coordinates>13.750000 -60.950000</coordinates>
         <location>
           <name>Hewanorra International Airport</name>
@@ -11426,7 +11426,7 @@
       </city>
       <city>
         <!-- A city in Saint Lucia -->
-        <_name>Vigie</_name>
+        <name>Vigie</name>
         <coordinates>14.033333 -61.016667</coordinates>
         <location>
           <name>Vigie</name>
@@ -11440,7 +11440,7 @@
            Martin / Sint Maarten. (The Dutch half is considered part of
            the Netherlands Antilles.)
         -->
-      <_name>Saint Martin</_name>
+      <name>Saint Martin</name>
       <iso-code>MF</iso-code>
       <fips-code>RN</fips-code>
       <timezones>
@@ -11450,7 +11450,7 @@
     </country>
     <country>
       <!-- VC - Saint Vincent and the Grenadines -->
-      <_name>Saint Vincent and the Grenadines</_name>
+      <name>Saint Vincent and the Grenadines</name>
       <iso-code>VC</iso-code>
       <fips-code>VC</fips-code>
       <timezones>
@@ -11459,7 +11459,7 @@
       <tz-hint>America/St_Vincent</tz-hint>
       <city>
         <!-- A city in Saint Vincent and the Grenadines -->
-        <_name>Arnos Vale</_name>
+        <name>Arnos Vale</name>
         <coordinates>13.133333 -61.200000</coordinates>
         <location>
           <name>Arnos Vale</name>
@@ -11469,7 +11469,7 @@
       </city>
       <city>
         <!-- The capital of Saint Vincent and the Grenadines -->
-        <_name>Kingstown</_name>
+        <name>Kingstown</name>
         <coordinates>13.133333 -61.216667</coordinates>
         <location>
           <name>Arnos Vale</name>
@@ -11482,7 +11482,7 @@
       <!-- GS - South Georgia and the South Sandwich Islands, a British
            territory in the South Atlantic.
         -->
-      <_name>South Georgia and the South Sandwich Islands</_name>
+      <name>South Georgia and the South Sandwich Islands</name>
       <iso-code>GS</iso-code>
       <fips-code>SX</fips-code>
       <timezones>
@@ -11492,7 +11492,7 @@
     </country>
     <country>
       <!-- SR - Suriname -->
-      <_name>Suriname</_name>
+      <name>Suriname</name>
       <!-- Could not find information about the following stations,
            which may be in Suriname:
            SMNI SMZO 
@@ -11505,7 +11505,7 @@
       <tz-hint>America/Paramaribo</tz-hint>
       <city>
         <!-- The capital of Suriname -->
-        <_name>Paramaribo</_name>
+        <name>Paramaribo</name>
         <coordinates>5.833333 -55.166667</coordinates>
         <location>
           <name>Johan A. Pengel</name>
@@ -11515,7 +11515,7 @@
       </city>
       <city>
         <!-- A city in Suriname -->
-        <_name>Zanderij</_name>
+        <name>Zanderij</name>
         <coordinates>5.450000 -55.200000</coordinates>
         <location>
           <name>Johan A. Pengel</name>
@@ -11526,7 +11526,7 @@
     </country>
     <country>
       <!-- TT - Trinidad and Tobago -->
-      <_name>Trinidad and Tobago</_name>
+      <name>Trinidad and Tobago</name>
       <iso-code>TT</iso-code>
       <fips-code>TD</fips-code>
       <timezones>
@@ -11535,7 +11535,7 @@
       <tz-hint>America/Port_of_Spain</tz-hint>
       <city>
         <!-- A city in Trinidad and Tobago -->
-        <_name>Bon Accord</_name>
+        <name>Bon Accord</name>
         <coordinates>11.150000 -60.833333</coordinates>
         <location>
           <name>Crown Pt. Airport, Scarborou</name>
@@ -11545,7 +11545,7 @@
       </city>
       <city>
         <!-- A city in Trinidad and Tobago -->
-        <_name>Piarco</_name>
+        <name>Piarco</name>
         <coordinates>10.583333 -61.333333</coordinates>
         <location>
           <name>Piarco International Airport, Trinidad</name>
@@ -11555,7 +11555,7 @@
       </city>
       <city>
         <!-- The capital of Trinidad and Tobago -->
-        <_name>Port-of-Spain</_name>
+        <name>Port-of-Spain</name>
         <coordinates>10.650000 -61.516667</coordinates>
         <location>
           <name>Piarco International Airport, Trinidad</name>
@@ -11568,7 +11568,7 @@
       <!-- TC - Turks and Caicos Islands, a British territory in the
            Caribbean
         -->
-      <_name>Turks and Caicos Islands</_name>
+      <name>Turks and Caicos Islands</name>
       <!-- Could not find weather stations for the following major
            cities:
            Grand Turk
@@ -11582,7 +11582,7 @@
     </country>
     <country>
       <!-- UY - Uruguay -->
-      <_name>Uruguay</_name>
+      <name>Uruguay</name>
       <iso-code>UY</iso-code>
       <fips-code>UY</fips-code>
       <timezones>
@@ -11591,7 +11591,7 @@
       <tz-hint>America/Montevideo</tz-hint>
       <city>
         <!-- A city in Uruguay -->
-        <_name>Carrasco</_name>
+        <name>Carrasco</name>
         <coordinates>-34.885278 -56.060556</coordinates>
         <location>
           <name>Carrasco</name>
@@ -11601,7 +11601,7 @@
       </city>
       <city>
         <!-- A city in Uruguay -->
-        <_name>Colonia</_name>
+        <name>Colonia</name>
         <coordinates>-34.466667 -57.850000</coordinates>
         <location>
           <name>Colonia</name>
@@ -11611,7 +11611,7 @@
       </city>
       <city>
         <!-- A city in Uruguay -->
-        <_name>Durazno</_name>
+        <name>Durazno</name>
         <coordinates>-33.413056 -56.500556</coordinates>
         <location>
           <name>Durazno</name>
@@ -11621,7 +11621,7 @@
       </city>
       <city>
         <!-- A city in Uruguay -->
-        <_name>Maldonado</_name>
+        <name>Maldonado</name>
         <coordinates>-34.900000 -54.950000</coordinates>
         <location>
           <name>Capitan Corbeta</name>
@@ -11631,7 +11631,7 @@
       </city>
       <city>
         <!-- The capital of Uruguay -->
-        <_name msgctxt="City in Uruguay">Montevideo</_name>
+        <name msgctxt="City in Uruguay">Montevideo</name>
         <coordinates>-34.858056 -56.170833</coordinates>
         <location>
           <name>Melilla</name>
@@ -11642,7 +11642,7 @@
     </country>
     <country>
       <!-- VE - Venezuela -->
-      <_name>Venezuela</_name>
+      <name>Venezuela</name>
       <iso-code>VE</iso-code>
       <fips-code>VE</fips-code>
       <timezones>
@@ -11651,7 +11651,7 @@
       <tz-hint>America/Caracas</tz-hint>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Acarigua</_name>
+        <name>Acarigua</name>
         <coordinates>9.559722 -69.201944</coordinates>
         <location>
           <name>Acarigua</name>
@@ -11661,7 +11661,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name msgctxt="City in Venezuela">Barcelona</_name>
+        <name msgctxt="City in Venezuela">Barcelona</name>
         <coordinates>10.133333 -64.700000</coordinates>
         <location>
           <name>Barcelona</name>
@@ -11671,7 +11671,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Barinas</_name>
+        <name>Barinas</name>
         <coordinates>8.629167 -70.207222</coordinates>
         <location>
           <name>Barinas</name>
@@ -11681,7 +11681,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Barquisimeto</_name>
+        <name>Barquisimeto</name>
         <coordinates>10.073889 -69.322778</coordinates>
         <location>
           <name>Barquisimeto</name>
@@ -11691,7 +11691,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Calabozo</_name>
+        <name>Calabozo</name>
         <coordinates>8.934444 -67.426667</coordinates>
         <location>
           <name>Calabozo</name>
@@ -11701,7 +11701,7 @@
       </city>
       <city>
         <!-- The capital of Venezuela -->
-        <_name>Caracas</_name>
+        <name>Caracas</name>
         <coordinates>10.500000 -66.916667</coordinates>
         <location>
           <name>La Carlota Airport</name>
@@ -11721,7 +11721,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Ciudad Bolívar</_name>
+        <name>Ciudad Bolívar</name>
         <coordinates>8.122222 -63.549722</coordinates>
         <location>
           <name>Ciudad Bolívar</name>
@@ -11731,7 +11731,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Coro</_name>
+        <name>Coro</name>
         <coordinates>11.409167 -69.667222</coordinates>
         <location>
           <name>Coro</name>
@@ -11741,7 +11741,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>El Variante</_name>
+        <name>El Variante</name>
         <coordinates>7.579444 -72.073889</coordinates>
         <location>
           <name>Sto. Domingo</name>
@@ -11751,7 +11751,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>El Vigía</_name>
+        <name>El Vigía</name>
         <coordinates>8.621944 -71.650556</coordinates>
         <location>
           <name>Perez Alph Airport</name>
@@ -11761,7 +11761,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Guanare</_name>
+        <name>Guanare</name>
         <coordinates>9.050000 -69.750000</coordinates>
         <location>
           <name>Guanare</name>
@@ -11771,7 +11771,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Guaricure</_name>
+        <name>Guaricure</name>
         <coordinates>11.766667 -70.131111</coordinates>
         <location>
           <name>Paraguana, Josefa Airport</name>
@@ -11781,7 +11781,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Guasdalito</_name>
+        <name>Guasdalito</name>
         <coordinates>7.247222 -70.729444</coordinates>
         <location>
           <name>Guasdalito</name>
@@ -11791,7 +11791,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Güiria</_name>
+        <name>Güiria</name>
         <coordinates>10.571111 -62.294444</coordinates>
         <location>
           <name>Güiria</name>
@@ -11801,7 +11801,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>La Chica</_name>
+        <name>La Chica</name>
         <coordinates>10.933333 -64.016667</coordinates>
         <location>
           <name>Margarita, Del Carib Airport</name>
@@ -11811,7 +11811,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Maracaibo</_name>
+        <name>Maracaibo</name>
         <coordinates>10.631667 -71.640556</coordinates>
         <location>
           <name>Maracaibo-La Chinita</name>
@@ -11821,7 +11821,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Maracay</_name>
+        <name>Maracay</name>
         <coordinates>10.246944 -67.595833</coordinates>
         <location>
           <name>Maracay-B. A. Sucre</name>
@@ -11831,7 +11831,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Maturín</_name>
+        <name>Maturín</name>
         <coordinates>9.750000 -63.176667</coordinates>
         <location>
           <name>Maturín</name>
@@ -11841,7 +11841,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Mene Grande</_name>
+        <name>Mene Grande</name>
         <coordinates>9.850278 -70.925556</coordinates>
         <location>
           <name>Mene Grande</name>
@@ -11851,7 +11851,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Morocure</_name>
+        <name>Morocure</name>
         <coordinates>8.260278 -62.707500</coordinates>
         <location>
           <name>Guayana, Manuel Car Airport</name>
@@ -11861,7 +11861,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name msgctxt="City in Venezuela">Mérida</_name>
+        <name msgctxt="City in Venezuela">Mérida</name>
         <coordinates>8.598333 -71.145000</coordinates>
         <location>
           <name>Mérida</name>
@@ -11871,7 +11871,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Paramillo</_name>
+        <name>Paramillo</name>
         <coordinates>7.805556 -72.216944</coordinates>
         <location>
           <name>Paramillo Private</name>
@@ -11881,7 +11881,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Puerto Ayacucho</_name>
+        <name>Puerto Ayacucho</name>
         <coordinates>5.663889 -67.623611</coordinates>
         <location>
           <name>Puerto Ayacucho</name>
@@ -11891,7 +11891,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Puerto Borburata</_name>
+        <name>Puerto Borburata</name>
         <coordinates>10.483889 -67.983889</coordinates>
         <location>
           <name>Pto. Cabello</name>
@@ -11901,7 +11901,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>San Antonio del Táchira</_name>
+        <name>San Antonio del Táchira</name>
         <coordinates>7.817778 -72.442500</coordinates>
         <location>
           <name>San Antonio del Táchira</name>
@@ -11911,7 +11911,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>San Felipe</_name>
+        <name>San Felipe</name>
         <coordinates>10.340556 -68.737222</coordinates>
         <location>
           <name>San Felipe</name>
@@ -11921,7 +11921,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name msgctxt="City in Venezuela">San Fernando</_name>
+        <name msgctxt="City in Venezuela">San Fernando</name>
         <coordinates>7.896667 -67.467222</coordinates>
         <location>
           <name>San Fernando</name>
@@ -11931,7 +11931,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>San Juan de los Morros</_name>
+        <name>San Juan de los Morros</name>
         <coordinates>9.911111 -67.358333</coordinates>
         <location>
           <name>San Juan de los Morros</name>
@@ -11941,7 +11941,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>San Tomé</_name>
+        <name>San Tomé</name>
         <coordinates>8.940833 -64.130833</coordinates>
         <location>
           <name>San Tome Private</name>
@@ -11951,7 +11951,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Santa Bárbara</_name>
+        <name>Santa Bárbara</name>
         <coordinates>8.983333 -71.900000</coordinates>
         <location>
           <name>Santa Barbara Zulia</name>
@@ -11961,7 +11961,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name msgctxt="City in Venezuela">Valencia</_name>
+        <name msgctxt="City in Venezuela">Valencia</name>
         <coordinates>10.180556 -68.003889</coordinates>
         <location>
           <name>Valencia</name>
@@ -11971,7 +11971,7 @@
       </city>
       <city>
         <!-- A city in Venezuela -->
-        <_name>Valera</_name>
+        <name>Valera</name>
         <coordinates>9.317778 -70.603611</coordinates>
         <location>
           <name>Valera</name>
@@ -11982,10 +11982,10 @@
     </country>
   </region>
   <region>
-    <_name>Europe</_name>
+    <name>Europe</name>
     <country>
       <!-- AL - Albania -->
-      <_name>Albania</_name>
+      <name>Albania</name>
       <iso-code>AL</iso-code>
       <fips-code>AL</fips-code>
       <timezones>
@@ -11997,7 +11997,7 @@
              "Tirana" is the traditional English name.
              The local name is "Tiranë".
           -->
-        <_name>Tirana</_name>
+        <name>Tirana</name>
         <coordinates>41.327500 19.818889</coordinates>
         <location>
           <name>Tirana</name>
@@ -12008,7 +12008,7 @@
     </country>
     <country>
       <!-- AD - Andorra -->
-      <_name>Andorra</_name>
+      <name>Andorra</name>
       <!-- Could not find weather stations for the following major
            cities:
            Andorra la Vella
@@ -12022,7 +12022,7 @@
     </country>
     <country>
       <!-- AT - Austria -->
-      <_name>Austria</_name>
+      <name>Austria</name>
       <iso-code>AT</iso-code>
       <fips-code>AU</fips-code>
       <timezones>
@@ -12033,7 +12033,7 @@
         <!-- A city in Austria.
              One of several cities in Austria called "Aigen".
           -->
-        <_name>Aigen im Ennstal</_name>
+        <name>Aigen im Ennstal</name>
         <coordinates>47.516667 14.133333</coordinates>
         <location>
           <name>Aigen im Ennstal</name>
@@ -12043,7 +12043,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Graz</_name>
+        <name>Graz</name>
         <coordinates>47.066667 15.450000</coordinates>
         <location>
           <name>Graz-Thalerhof Airport</name>
@@ -12053,7 +12053,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Hohenems</_name>
+        <name>Hohenems</name>
         <coordinates>47.366667 9.683056</coordinates>
         <location>
           <name>Hohenems-Dornbirn</name>
@@ -12063,7 +12063,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Innsbruck</_name>
+        <name>Innsbruck</name>
         <coordinates>47.266667 11.400000</coordinates>
         <location>
           <name>Innsbruck Airport</name>
@@ -12073,7 +12073,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Klagenfurt</_name>
+        <name>Klagenfurt</name>
         <coordinates>46.624722 14.305278</coordinates>
         <location>
           <name>Klagenfurt Airport</name>
@@ -12083,7 +12083,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Linz</_name>
+        <name>Linz</name>
         <coordinates>48.300000 14.300000</coordinates>
         <location>
           <name>Linz / Hoersching Airport</name>
@@ -12093,7 +12093,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Salzburg</_name>
+        <name>Salzburg</name>
         <coordinates>47.800000 13.033333</coordinates>
         <location>
           <name>Salzburg Airport</name>
@@ -12103,7 +12103,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Teesdorf</_name>
+        <name>Teesdorf</name>
         <coordinates>47.950000 16.283333</coordinates>
         <location>
           <name>Niederosterreich / Airport Voslau</name>
@@ -12113,7 +12113,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Tulln</_name>
+        <name>Tulln</name>
         <coordinates>48.333333 16.050000</coordinates>
         <location>
           <name>Tulln</name>
@@ -12126,7 +12126,7 @@
              "Vienna" is the traditional English name.
              The local name in German is "Wien".
           -->
-        <_name>Vienna</_name>
+        <name>Vienna</name>
         <coordinates>48.200000 16.366667</coordinates>
         <location>
           <name>Vienna / Schwechat Airport</name>
@@ -12136,7 +12136,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Wiener Neustadt</_name>
+        <name>Wiener Neustadt</name>
         <coordinates>47.800000 16.250000</coordinates>
         <location>
           <name>Niederosterreich / Wiener Neustadt-Ost Airport</name>
@@ -12146,7 +12146,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Zell am See</_name>
+        <name>Zell am See</name>
         <coordinates>47.316667 12.783333</coordinates>
         <location>
           <name>Zell am See</name>
@@ -12156,7 +12156,7 @@
       </city>
       <city>
         <!-- A city in Austria -->
-        <_name>Zeltweg</_name>
+        <name>Zeltweg</name>
         <coordinates>47.183333 14.750000</coordinates>
         <location>
           <name>Zeltweg</name>
@@ -12167,7 +12167,7 @@
     </country>
     <country>
       <!-- BY - Belarus -->
-      <_name>Belarus</_name>
+      <name>Belarus</name>
       <iso-code>BY</iso-code>
       <fips-code>BO</fips-code>
       <timezones>
@@ -12176,7 +12176,7 @@
       <tz-hint>Europe/Minsk</tz-hint>
       <city>
         <!-- A city in Belarus -->
-        <_name msgctxt="City in Belarus">Brest</_name>
+        <name msgctxt="City in Belarus">Brest</name>
         <coordinates>52.100000 23.700000</coordinates>
         <location>
           <name>Brest</name>
@@ -12186,7 +12186,7 @@
       </city>
       <city>
         <!-- A city in Belarus -->
-        <_name>Homyel'</_name>
+        <name>Homyel'</name>
         <coordinates>52.441667 30.983333</coordinates>
         <location>
           <name>Homyel'</name>
@@ -12196,7 +12196,7 @@
       </city>
       <city>
         <!-- A city in Belarus -->
-        <_name>Hrodna</_name>
+        <name>Hrodna</name>
         <coordinates>53.681389 23.814722</coordinates>
         <location>
           <name>Hrodna</name>
@@ -12206,7 +12206,7 @@
       </city>
       <city>
         <!-- The capital of Belarus -->
-        <_name>Minsk</_name>
+        <name>Minsk</name>
         <coordinates>53.900000 27.566667</coordinates>
         <location>
           <name>Loshitsa / Minsk International</name>
@@ -12221,7 +12221,7 @@
       </city>
       <city>
         <!-- A city in Belarus -->
-        <_name>Vitsyebsk</_name>
+        <name>Vitsyebsk</name>
         <coordinates>55.192500 30.194444</coordinates>
         <location>
           <name>Vitsyebsk</name>
@@ -12234,7 +12234,7 @@
       <!-- BE - Belgium. The local names for the country are "België"
            (Dutch), Belgique (French), and Belgien (German).
         -->
-      <_name>Belgium</_name>
+      <name>Belgium</name>
       <!-- Could not find information about the following stations,
            which may be in Belgium:
            EBLH 
@@ -12249,14 +12249,14 @@
         <!-- A state in Belgium. local name (nl): Antwerpen. local name
              (fr): Anvers. local name (de): Antwerpen.
           -->
-        <_name msgctxt="State in Belgium">Antwerp</_name>
+        <name msgctxt="State in Belgium">Antwerp</name>
         <fips-code>BE01</fips-code>
         <city>
           <!-- A city in Antwerp in Belgium.
                "Antwerp" is the traditional English name.
                The local name is "Antwerpen".
             -->
-          <_name msgctxt="City in Antwerp, Belgium">Antwerp</_name>
+          <name msgctxt="City in Antwerp, Belgium">Antwerp</name>
           <coordinates>51.216667 4.416667</coordinates>
           <location>
             <name>Antwerp / Deurne</name>
@@ -12271,7 +12271,7 @@
              et wallon. local name (de): Brüssel, Flämish- und
              Wallonisch-Brabant.
           -->
-        <_name>Brussels, Flemish and Walloon Brabant</_name>
+        <name>Brussels, Flemish and Walloon Brabant</name>
         <fips-code>BE02</fips-code>
         <fips-code>BE10</fips-code>
         <fips-code>BE11</fips-code>
@@ -12280,7 +12280,7 @@
           <!-- A city in Brussels, Flemish and Walloon Brabant in
                Belgium
             -->
-          <_name>Beauvechain</_name>
+          <name>Beauvechain</name>
           <coordinates>50.783333 4.766667</coordinates>
           <location>
             <name>Beauvechain</name>
@@ -12294,7 +12294,7 @@
                The local name in French is "Bruxelles".
                The local name in Dutch is "Brussel".
             -->
-          <_name>Brussels</_name>
+          <name>Brussels</name>
           <coordinates>50.833333 4.333333</coordinates>
           <location>
             <name>Bruxelles National</name>
@@ -12306,7 +12306,7 @@
           <!-- A city in Brussels, Flemish and Walloon Brabant in
                Belgium
             -->
-          <_name>Schaffen</_name>
+          <name>Schaffen</name>
           <coordinates>51.000000 5.083333</coordinates>
           <location>
             <name>Schaffen</name>
@@ -12317,7 +12317,7 @@
       </state>
       <state>
         <!-- A state/province/territory in Belgium -->
-        <_name>East-Flanders</_name>
+        <name>East-Flanders</name>
         <fips-code>BE08</fips-code>
       </state>
       <state>
@@ -12325,11 +12325,11 @@
              (fr_BE): Hinnot. local name (nl): Henegouwen. local name
              (de): Hennegau.
           -->
-        <_name>Hainaut</_name>
+        <name>Hainaut</name>
         <fips-code>BE03</fips-code>
         <city>
           <!-- A city in Hainaut in Belgium -->
-          <_name>Chièvres</_name>
+          <name>Chièvres</name>
           <coordinates>50.583333 3.800000</coordinates>
           <location>
             <name>Chièvres</name>
@@ -12339,7 +12339,7 @@
         </city>
         <city>
           <!-- A city in Hainaut in Belgium -->
-          <_name>Gosselies</_name>
+          <name>Gosselies</name>
           <coordinates>50.466667 4.416667</coordinates>
           <location>
             <name>Charleroi / Gosselies</name>
@@ -12352,11 +12352,11 @@
         <!-- A state in Belgium. local name (nl): Limburg. local name
              (fr): Limbourg. local name (de): Limburg.
           -->
-        <_name>Limburg</_name>
+        <name>Limburg</name>
         <fips-code>BE05</fips-code>
         <city>
           <!-- A city in Limburg in Belgium -->
-          <_name>Kleine-Brogel</_name>
+          <name>Kleine-Brogel</name>
           <coordinates>51.166667 5.433333</coordinates>
           <location>
             <name>Kleine-Brogel</name>
@@ -12370,11 +12370,11 @@
              (fr_BE): Lîdje. local name (nl): Luik. local name (de):
              Lüttich.
           -->
-        <_name>Liège</_name>
+        <name>Liège</name>
         <fips-code>BE04</fips-code>
         <city>
           <!-- A city in Liège in Belgium -->
-          <_name>Bierset</_name>
+          <name>Bierset</name>
           <coordinates>50.650000 5.433333</coordinates>
           <location>
             <name>Bierset</name>
@@ -12384,7 +12384,7 @@
         </city>
         <city>
           <!-- A city in Liège in Belgium -->
-          <_name>Elsenborn</_name>
+          <name>Elsenborn</name>
           <coordinates>50.450000 6.216667</coordinates>
           <location>
             <name>Elsenborn</name>
@@ -12395,16 +12395,16 @@
       </state>
       <state>
         <!-- A state/province/territory in Belgium -->
-        <_name msgctxt="State in Belgium">Luxembourg</_name>
+        <name msgctxt="State in Belgium">Luxembourg</name>
         <fips-code>BE06</fips-code>
       </state>
       <state>
         <!-- A state/province/territory in Belgium -->
-        <_name>Namur</_name>
+        <name>Namur</name>
         <fips-code>BE07</fips-code>
         <city>
           <!-- A city in Namur in Belgium -->
-          <_name>Florennes</_name>
+          <name>Florennes</name>
           <coordinates>50.250000 4.616667</coordinates>
           <location>
             <name>Florennes</name>
@@ -12418,11 +12418,11 @@
              local name (fr): Flandre occidentale. local name (de):
              Westflandern.
           -->
-        <_name>West-Flanders</_name>
+        <name>West-Flanders</name>
         <fips-code>BE09</fips-code>
         <city>
           <!-- A city in West-Flanders in Belgium -->
-          <_name>Koksijde</_name>
+          <name>Koksijde</name>
           <coordinates>51.100000 2.650000</coordinates>
           <location>
             <name>Koksijde</name>
@@ -12432,7 +12432,7 @@
         </city>
         <city>
           <!-- A city in West-Flanders in Belgium -->
-          <_name>Oostende</_name>
+          <name>Oostende</name>
           <coordinates>51.216667 2.916667</coordinates>
           <location>
             <name>Oostende Airport</name>
@@ -12444,7 +12444,7 @@
     </country>
     <country>
       <!-- BA - Bosnia and Herzegovina -->
-      <_name>Bosnia and Herzegovina</_name>
+      <name>Bosnia and Herzegovina</name>
       <iso-code>BA</iso-code>
       <fips-code>BK</fips-code>
       <timezones>
@@ -12453,7 +12453,7 @@
       <tz-hint>Europe/Sarajevo</tz-hint>
       <city>
         <!-- A city in Bosnia and Herzegovina -->
-        <_name>Banja Luka</_name>
+        <name>Banja Luka</name>
         <coordinates>44.775833 17.185556</coordinates>
         <location>
           <name>Banja Luka</name>
@@ -12463,7 +12463,7 @@
       </city>
       <city>
         <!-- A city in Bosnia and Herzegovina -->
-        <_name>Mostar</_name>
+        <name>Mostar</name>
         <coordinates>43.343333 17.808056</coordinates>
         <location>
           <name>Mostar</name>
@@ -12473,7 +12473,7 @@
       </city>
       <city>
         <!-- The capital of Bosnia and Herzegovina -->
-        <_name>Sarajevo</_name>
+        <name>Sarajevo</name>
         <coordinates>43.850000 18.383333</coordinates>
         <location>
           <name>Sarajevo</name>
@@ -12484,7 +12484,7 @@
     </country>
     <country>
       <!-- BG - Bulgaria -->
-      <_name>Bulgaria</_name>
+      <name>Bulgaria</name>
       <iso-code>BG</iso-code>
       <fips-code>BU</fips-code>
       <timezones>
@@ -12493,7 +12493,7 @@
       <tz-hint>Europe/Sofia</tz-hint>
       <city>
         <!-- A city in Bulgaria -->
-        <_name>Burgas</_name>
+        <name>Burgas</name>
         <coordinates>42.506058 27.467810</coordinates>
         <location>
           <name>Burgas</name>
@@ -12503,7 +12503,7 @@
       </city>
       <city>
         <!-- A city in Bulgaria -->
-        <_name>Gorna Oryakhovitsa</_name>
+        <name>Gorna Oryakhovitsa</name>
         <coordinates>43.127778 25.701667</coordinates>
         <location>
           <name>Gorna Oryakhovitsa</name>
@@ -12513,7 +12513,7 @@
       </city>
       <city>
         <!-- A city in Bulgaria -->
-        <_name>Plovdiv</_name>
+        <name>Plovdiv</name>
         <coordinates>42.150000 24.750000</coordinates>
         <location>
           <name>Plovdiv</name>
@@ -12526,7 +12526,7 @@
              "Sofia" is the traditional English name.
              The local name is "Sofiya".
           -->
-        <_name>Sofia</_name>
+        <name>Sofia</name>
         <coordinates>42.683333 23.316667</coordinates>
         <location>
           <name>Sofia Observatory</name>
@@ -12536,7 +12536,7 @@
       </city>
       <city>
         <!-- A city in Bulgaria -->
-        <_name>Varna</_name>
+        <name>Varna</name>
         <coordinates>43.216667 27.916667</coordinates>
         <location>
           <name>Varna</name>
@@ -12547,7 +12547,7 @@
     </country>
     <country>
       <!-- HR - Croatia -->
-      <_name>Croatia</_name>
+      <name>Croatia</name>
       <iso-code>HR</iso-code>
       <fips-code>HR</fips-code>
       <timezones>
@@ -12556,7 +12556,7 @@
       <tz-hint>Europe/Zagreb</tz-hint>
       <city>
         <!-- A city in Croatia -->
-        <_name>Bol</_name>
+        <name>Bol</name>
         <coordinates>43.261944 16.655000</coordinates>
         <location>
           <name>Brac</name>
@@ -12566,7 +12566,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Dubrovnik</_name>
+        <name>Dubrovnik</name>
         <coordinates>42.650556 18.091389</coordinates>
         <location>
           <name>Dubrovnik / Čilipi</name>
@@ -12576,7 +12576,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Jelovice</_name>
+        <name>Jelovice</name>
         <coordinates>45.498056 14.014444</coordinates>
         <location>
           <name>Pula Airport</name>
@@ -12586,7 +12586,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Liška</_name>
+        <name>Liška</name>
         <coordinates>44.576667 14.376111</coordinates>
         <location>
           <name>Losinj Island</name>
@@ -12596,7 +12596,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Osijek</_name>
+        <name>Osijek</name>
         <coordinates>45.551111 18.693889</coordinates>
         <location>
           <name>Osijek / Čepin</name>
@@ -12606,7 +12606,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Rijeka</_name>
+        <name>Rijeka</name>
         <coordinates>45.343056 14.409167</coordinates>
         <location>
           <name>Rijeka / Omišalj</name>
@@ -12616,7 +12616,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Split</_name>
+        <name>Split</name>
         <coordinates>43.513889 16.455833</coordinates>
         <location>
           <name>Split / Resnik</name>
@@ -12626,7 +12626,7 @@
       </city>
       <city>
         <!-- A city in Croatia -->
-        <_name>Zadar</_name>
+        <name>Zadar</name>
         <coordinates>44.119722 15.242222</coordinates>
         <location>
           <name>Zadar / Donji Zemunik</name>
@@ -12636,7 +12636,7 @@
       </city>
       <city>
         <!-- The capital of Croatia -->
-        <_name>Zagreb</_name>
+        <name>Zagreb</name>
         <coordinates>45.800000 16.000000</coordinates>
         <location>
           <name>Zagreb / Pleso</name>
@@ -12647,7 +12647,7 @@
     </country>
     <country>
       <!-- CY - Cyprus -->
-      <_name>Cyprus</_name>
+      <name>Cyprus</name>
       <iso-code>CY</iso-code>
       <fips-code>CY</fips-code>
       <timezones>
@@ -12656,7 +12656,7 @@
       <tz-hint>Asia/Nicosia</tz-hint>
       <city>
         <!-- A city in Cyprus -->
-        <_name>Akrotiri</_name>
+        <name>Akrotiri</name>
         <coordinates>34.604167 32.958333</coordinates>
         <location>
           <name>Akrotiri</name>
@@ -12666,7 +12666,7 @@
       </city>
       <city>
         <!-- A city in Cyprus -->
-        <_name>Larnaca</_name>
+        <name>Larnaca</name>
         <coordinates>34.916667 33.629167</coordinates>
         <location>
           <name>Larnaca Airport</name>
@@ -12676,7 +12676,7 @@
       </city>
       <city>
         <!-- The capital of Cyprus -->
-        <_name>Nicosia</_name>
+        <name>Nicosia</name>
         <coordinates>35.166667 33.366667</coordinates>
         <location>
           <name>Ercan</name>
@@ -12686,7 +12686,7 @@
       </city>
       <city>
         <!-- A city in Cyprus -->
-        <_name>Paphos</_name>
+        <name>Paphos</name>
         <coordinates>34.766667 32.416667</coordinates>
         <location>
           <name>Paphos Airport</name>
@@ -12696,7 +12696,7 @@
       </city>
       <city>
         <!-- A city in Cyprus -->
-        <_name>Tymbou</_name>
+        <name>Tymbou</name>
         <coordinates>35.133333 33.512500</coordinates>
         <location>
           <name>Ercan</name>
@@ -12707,7 +12707,7 @@
     </country>
     <country>
       <!-- CZ - Czech Republic -->
-      <_name>Czech Republic</_name>
+      <name>Czech Republic</name>
       <!-- Could not find information about the following stations,
            which may be in Czech Republic:
            LKCV LKKB LKLN LKNA LKPD LKPO 
@@ -12720,7 +12720,7 @@
       <tz-hint>Europe/Prague</tz-hint>
       <city>
         <!-- A city in the Czech Republic -->
-        <_name>Brno</_name>
+        <name>Brno</name>
         <coordinates>49.200000 16.633333</coordinates>
         <location>
           <name>Brno-Turany Airport</name>
@@ -12730,7 +12730,7 @@
       </city>
       <city>
         <!-- A city in the Czech Republic -->
-        <_name>Holešov</_name>
+        <name>Holešov</name>
         <coordinates>49.333333 17.583333</coordinates>
         <location>
           <name>Holešov</name>
@@ -12740,7 +12740,7 @@
       </city>
       <city>
         <!-- A city in the Czech Republic -->
-        <_name>Karlovy Vary</_name>
+        <name>Karlovy Vary</name>
         <coordinates>50.216667 12.900000</coordinates>
         <location>
           <name>Karlovy Vary</name>
@@ -12750,7 +12750,7 @@
       </city>
       <city>
         <!-- A city in the Czech Republic -->
-        <_name>Liberec</_name>
+        <name>Liberec</name>
         <coordinates>50.763889 15.065278</coordinates>
         <location>
           <name>Liberec</name>
@@ -12760,7 +12760,7 @@
       </city>
       <city>
         <!-- A city in the Czech Republic -->
-        <_name>Ostrava</_name>
+        <name>Ostrava</name>
         <coordinates>49.833333 18.283333</coordinates>
         <location>
           <name>Ostrava-Mosnov Airport</name>
@@ -12773,7 +12773,7 @@
              "Prague" is the traditional English name.
              The local name in Czech is "Praha".
           -->
-        <_name>Prague</_name>
+        <name>Prague</name>
         <coordinates>50.083333 14.466667</coordinates>
         <location>
           <name>Prague-Ruzyne Airport</name>
@@ -12784,7 +12784,7 @@
     </country>
     <country>
       <!-- DK - Denmark. The Danish name is "Danmark" -->
-      <_name>Denmark</_name>
+      <name>Denmark</name>
       <iso-code>DK</iso-code>
       <fips-code>DA</fips-code>
       <timezones>
@@ -12793,7 +12793,7 @@
       <tz-hint>Europe/Copenhagen</tz-hint>
       <city>
         <!-- A city in Denmark -->
-        <_name>Billund</_name>
+        <name>Billund</name>
         <coordinates>55.733333 9.116667</coordinates>
         <location>
           <name>Billund Airport</name>
@@ -12806,7 +12806,7 @@
              "Copenhagen" is the traditional English name.
              The local name is "København".
           -->
-        <_name>Copenhagen</_name>
+        <name>Copenhagen</name>
         <coordinates>55.666667 12.583333</coordinates>
         <location>
           <name>Koebenhavn / Kastrup</name>
@@ -12816,7 +12816,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Esbjerg</_name>
+        <name>Esbjerg</name>
         <coordinates>55.466667 8.450000</coordinates>
         <location>
           <name>Esbjerg</name>
@@ -12826,7 +12826,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Karup</_name>
+        <name>Karup</name>
         <coordinates>56.300000 9.166667</coordinates>
         <location>
           <name>Karup</name>
@@ -12836,7 +12836,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Kastrup</_name>
+        <name>Kastrup</name>
         <coordinates>55.633333 12.650000</coordinates>
         <location>
           <name>Koebenhavn / Kastrup</name>
@@ -12846,7 +12846,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Mejlby</_name>
+        <name>Mejlby</name>
         <coordinates>56.000000 8.333333</coordinates>
         <location>
           <name>Stauning Airport</name>
@@ -12856,7 +12856,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Odense</_name>
+        <name>Odense</name>
         <coordinates>55.400000 10.383333</coordinates>
         <location>
           <name>Odense / Beldringe</name>
@@ -12866,7 +12866,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Roskilde</_name>
+        <name>Roskilde</name>
         <coordinates>55.650000 12.083333</coordinates>
         <location>
           <name>Koebenhavn / Roskilde</name>
@@ -12876,7 +12876,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Rønne</_name>
+        <name>Rønne</name>
         <coordinates>55.100000 14.700000</coordinates>
         <location>
           <name>Roenne</name>
@@ -12886,7 +12886,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Skrydstrup</_name>
+        <name>Skrydstrup</name>
         <coordinates>55.233333 9.250000</coordinates>
         <location>
           <name>Skrydstrup</name>
@@ -12896,7 +12896,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Sottrupskov</_name>
+        <name>Sottrupskov</name>
         <coordinates>54.966667 9.750000</coordinates>
         <location>
           <name>Soenderborg Airport</name>
@@ -12906,7 +12906,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Tirstrup</_name>
+        <name>Tirstrup</name>
         <coordinates>56.300000 10.700000</coordinates>
         <location>
           <name>Tirstrup</name>
@@ -12916,7 +12916,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Vamdrup</_name>
+        <name>Vamdrup</name>
         <coordinates>55.416667 9.283333</coordinates>
         <location>
           <name>Vamdrup</name>
@@ -12926,7 +12926,7 @@
       </city>
       <city>
         <!-- A city in Denmark -->
-        <_name>Ålborg</_name>
+        <name>Ålborg</name>
         <coordinates>57.050000 9.933333</coordinates>
         <location>
           <name>Ålborg</name>
@@ -12937,7 +12937,7 @@
     </country>
     <country>
       <!-- EE - Estonia -->
-      <_name>Estonia</_name>
+      <name>Estonia</name>
       <iso-code>EE</iso-code>
       <fips-code>EN</fips-code>
       <timezones>
@@ -12946,7 +12946,7 @@
       <tz-hint>Europe/Tallinn</tz-hint>
       <city>
         <!-- A city in Estonia -->
-        <_name>Kuressaare</_name>
+        <name>Kuressaare</name>
         <coordinates>58.248056 22.503889</coordinates>
         <location>
           <name>Kuressaare</name>
@@ -12956,7 +12956,7 @@
       </city>
       <city>
         <!-- A city in Estonia -->
-        <_name>Kärdla</_name>
+        <name>Kärdla</name>
         <coordinates>58.997778 22.749167</coordinates>
         <location>
           <name>Kärdla</name>
@@ -12966,7 +12966,7 @@
       </city>
       <city>
         <!-- A city in Estonia -->
-        <_name>Pärnu</_name>
+        <name>Pärnu</name>
         <coordinates>58.374722 24.513611</coordinates>
         <location>
           <name>Pärnu</name>
@@ -12976,7 +12976,7 @@
       </city>
       <city>
         <!-- The capital of Estonia -->
-        <_name>Tallinn</_name>
+        <name>Tallinn</name>
         <coordinates>59.433889 24.728056</coordinates>
         <location>
           <name>Tallinn</name>
@@ -12986,7 +12986,7 @@
       </city>
       <city>
         <!-- A city in Estonia -->
-        <_name>Tartu</_name>
+        <name>Tartu</name>
         <coordinates>58.366111 26.736111</coordinates>
         <location>
           <name>Tartu / Ülenurme</name>
@@ -12999,7 +12999,7 @@
       <!-- FO - Faroe Islands, an autonomous province of Denmark in the
            north Atlantic.
         -->
-      <_name>Faroe Islands</_name>
+      <name>Faroe Islands</name>
       <!-- Could not find information about the following stations,
            which may be in Faroe Islands:
            EKGF 
@@ -13012,7 +13012,7 @@
       <tz-hint>Atlantic/Faroe</tz-hint>
       <city>
         <!-- A city in the Faroe Islands -->
-        <_name>Sørvágur</_name>
+        <name>Sørvágur</name>
         <coordinates>62.066667 -7.300000</coordinates>
         <location>
           <name>Sørvágur / Vagar</name>
@@ -13022,7 +13022,7 @@
       </city>
       <city>
         <!-- The capital of the Faroe Islands -->
-        <_name>Tórshavn</_name>
+        <name>Tórshavn</name>
         <coordinates>62.016667 -6.766667</coordinates>
         <location>
           <name>Soervaag / Vagar</name>
@@ -13033,7 +13033,7 @@
     </country>
     <country>
       <!-- FI - Finland -->
-      <_name>Finland</_name>
+      <name>Finland</name>
       <iso-code>FI</iso-code>
       <fips-code>FI</fips-code>
       <pref-lang>fin</pref-lang>
@@ -13043,7 +13043,7 @@
       <tz-hint>Europe/Helsinki</tz-hint>
       <city>
         <!-- A city in Finland -->
-        <_name>Enontekiö</_name>
+        <name>Enontekiö</name>
         <coordinates>68.383333 23.633333</coordinates>
         <location>
           <name>Enontekiö</name>
@@ -13053,7 +13053,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Halli</_name>
+        <name>Halli</name>
         <coordinates>61.866667 24.833333</coordinates>
         <location>
           <name>Halli</name>
@@ -13065,7 +13065,7 @@
         <!-- The capital of Finland.
              The local name in Swedish is "Helsingfors".
           -->
-        <_name>Helsinki</_name>
+        <name>Helsinki</name>
         <coordinates>60.175556 24.934167</coordinates>
         <location>
           <name>Helsinki-Malmi</name>
@@ -13077,7 +13077,7 @@
         <!-- A city in Finland.
              The local name in Swedish is "Vanda".
           -->
-        <_name>Vantaa</_name>
+        <name>Vantaa</name>
         <coordinates>60.1760 24.5100</coordinates>
         <location>
           <name>Helsinki-Vantaa</name>
@@ -13087,7 +13087,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Ivalo</_name>
+        <name>Ivalo</name>
         <coordinates>68.650000 27.600000</coordinates>
         <location>
           <name>Ivalo</name>
@@ -13097,7 +13097,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Joensuu</_name>
+        <name>Joensuu</name>
         <coordinates>62.600000 29.766667</coordinates>
         <location>
           <name>Joensuu</name>
@@ -13107,7 +13107,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Jyväskylä</_name>
+        <name>Jyväskylä</name>
         <coordinates>62.233333 25.733333</coordinates>
         <location>
           <name>Jyväskylä</name>
@@ -13117,7 +13117,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kajaani</_name>
+        <name>Kajaani</name>
         <coordinates>64.233333 27.683333</coordinates>
         <location>
           <name>Kajaani</name>
@@ -13127,7 +13127,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kauhava</_name>
+        <name>Kauhava</name>
         <coordinates>63.100000 23.083333</coordinates>
         <location>
           <name>Kauhava</name>
@@ -13137,7 +13137,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kemi</_name>
+        <name>Kemi</name>
         <coordinates>65.733333 24.566667</coordinates>
         <location>
           <name>Kemi</name>
@@ -13147,7 +13147,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kittilä</_name>
+        <name>Kittilä</name>
         <coordinates>67.666667 24.900000</coordinates>
         <location>
           <name>Kittilä</name>
@@ -13159,7 +13159,7 @@
         <!-- A city in Finland.
              The local name in Swedish is "Kronoby".
           -->
-        <_name>Kruunupyy</_name>
+        <name>Kruunupyy</name>
         <coordinates>63.716667 23.033333</coordinates>
         <location>
           <name>Kruunupyy</name>
@@ -13169,7 +13169,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kuopio</_name>
+        <name>Kuopio</name>
         <coordinates>62.900000 27.683333</coordinates>
         <location>
           <name>Kuopio</name>
@@ -13179,7 +13179,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Kuusamo</_name>
+        <name>Kuusamo</name>
         <coordinates>65.966667 29.183333</coordinates>
         <location>
           <name>Kuusamo</name>
@@ -13189,7 +13189,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Lappeenranta</_name>
+        <name>Lappeenranta</name>
         <coordinates>61.066667 28.183333</coordinates>
         <location>
           <name>Lappeenranta</name>
@@ -13199,7 +13199,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Mikkeli</_name>
+        <name>Mikkeli</name>
         <coordinates>61.683333 27.250000</coordinates>
         <location>
           <name>Mikkeli</name>
@@ -13209,7 +13209,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Oulu</_name>
+        <name>Oulu</name>
         <coordinates>65.016667 25.466667</coordinates>
         <location>
           <name>Oulu</name>
@@ -13219,7 +13219,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Pori</_name>
+        <name>Pori</name>
         <coordinates>61.483333 21.783333</coordinates>
         <location>
           <name>Pori</name>
@@ -13229,7 +13229,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Rovaniemi</_name>
+        <name>Rovaniemi</name>
         <coordinates>66.500000 25.716667</coordinates>
         <location>
           <name>Rovaniemi</name>
@@ -13239,7 +13239,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Savonlinna</_name>
+        <name>Savonlinna</name>
         <coordinates>61.866667 28.883333</coordinates>
         <location>
           <name>Savonlinna</name>
@@ -13249,7 +13249,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Seinäjoki</_name>
+        <name>Seinäjoki</name>
         <coordinates>62.800000 22.833333</coordinates>
         <location>
           <name>Seinajoki-Ilmajok</name>
@@ -13259,7 +13259,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Tampere</_name>
+        <name>Tampere</name>
         <coordinates>61.500000 23.750000</coordinates>
         <location>
           <name>Tampere / Pirkkala</name>
@@ -13271,7 +13271,7 @@
         <!-- A city in Finland.
              The local name in Swedish is "Åbo".
           -->
-        <_name>Turku</_name>
+        <name>Turku</name>
         <coordinates>60.450000 22.283333</coordinates>
         <location>
           <name>Turku</name>
@@ -13281,7 +13281,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Utti</_name>
+        <name>Utti</name>
         <coordinates>60.883333 26.933333</coordinates>
         <location>
           <name>Utti</name>
@@ -13293,7 +13293,7 @@
         <!-- A city in Finland.
              The local name in Swedish is "Vasa".
           -->
-        <_name>Vaasa</_name>
+        <name>Vaasa</name>
         <coordinates>63.100000 21.600000</coordinates>
         <location>
           <name>Vaasa</name>
@@ -13303,7 +13303,7 @@
       </city>
       <city>
         <!-- A city in Finland -->
-        <_name>Varkaus</_name>
+        <name>Varkaus</name>
         <coordinates>62.316667 27.916667</coordinates>
         <location>
           <name>Varkaus</name>
@@ -13314,7 +13314,7 @@
     </country>
     <country>
       <!-- FR - France -->
-      <_name>France</_name>
+      <name>France</name>
       <iso-code>FR</iso-code>
       <fips-code>FR</fips-code>
       <timezones>
@@ -13323,7 +13323,7 @@
       <tz-hint>Europe/Paris</tz-hint>
       <city>
         <!-- A city in France -->
-        <_name>Abbeville</_name>
+        <name>Abbeville</name>
         <coordinates>50.100000 1.833333</coordinates>
         <location>
           <name>Abbeville</name>
@@ -13333,7 +13333,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Acon</_name>
+        <name>Acon</name>
         <coordinates>48.766667 1.100000</coordinates>
         <location>
           <name>Toussus le Noble</name>
@@ -13343,7 +13343,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Agen</_name>
+        <name>Agen</name>
         <coordinates>44.200000 0.633333</coordinates>
         <location>
           <name>Agen</name>
@@ -13353,7 +13353,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Ajaccio</_name>
+        <name>Ajaccio</name>
         <coordinates>41.916667 8.733333</coordinates>
         <location>
           <name>Ajaccio</name>
@@ -13363,7 +13363,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Alençon</_name>
+        <name>Alençon</name>
         <coordinates>48.433333 0.083333</coordinates>
         <location>
           <name>Alençon</name>
@@ -13375,7 +13375,7 @@
         <!-- A city in France.
              One of several cities in France called "Ambérieu".
           -->
-        <_name>Ambérieu-en-Bugey</_name>
+        <name>Ambérieu-en-Bugey</name>
         <coordinates>45.950000 5.350000</coordinates>
         <location>
           <name>Ambérieu-en-Bugey</name>
@@ -13385,7 +13385,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Auch</_name>
+        <name>Auch</name>
         <coordinates>43.650000 0.583333</coordinates>
         <location>
           <name>Auch</name>
@@ -13395,7 +13395,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Aurillac</_name>
+        <name>Aurillac</name>
         <coordinates>44.916667 2.450000</coordinates>
         <location>
           <name>Aurillac</name>
@@ -13405,7 +13405,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Avord</_name>
+        <name>Avord</name>
         <coordinates>47.033333 2.650000</coordinates>
         <location>
           <name>Avord</name>
@@ -13415,7 +13415,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Bastia</_name>
+        <name>Bastia</name>
         <coordinates>42.702778 9.450000</coordinates>
         <location>
           <name>Bastia</name>
@@ -13425,7 +13425,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Beauvais</_name>
+        <name>Beauvais</name>
         <coordinates>49.433333 2.083333</coordinates>
         <location>
           <name>Beauvais</name>
@@ -13435,7 +13435,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Bergerac</_name>
+        <name>Bergerac</name>
         <coordinates>44.850000 0.483333</coordinates>
         <location>
           <name>Bergerac</name>
@@ -13445,7 +13445,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Biarritz</_name>
+        <name>Biarritz</name>
         <coordinates>43.483333 -1.566667</coordinates>
         <location>
           <name>Biarritz</name>
@@ -13455,7 +13455,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name msgctxt="City in France">Bordeaux</_name>
+        <name msgctxt="City in France">Bordeaux</name>
         <coordinates>44.833333 -0.566667</coordinates>
         <location>
           <name>Bordeaux-Merignac Airport</name>
@@ -13465,7 +13465,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Bourges</_name>
+        <name>Bourges</name>
         <coordinates>47.083333 2.400000</coordinates>
         <location>
           <name>Bourges</name>
@@ -13475,7 +13475,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name msgctxt="City in France">Brest</_name>
+        <name msgctxt="City in France">Brest</name>
         <coordinates>48.400000 -4.483333</coordinates>
         <location>
           <name>Brest</name>
@@ -13485,7 +13485,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Brive</_name>
+        <name>Brive</name>
         <coordinates>45.150000 1.533333</coordinates>
         <location>
           <name>Brive</name>
@@ -13495,7 +13495,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Béziers</_name>
+        <name>Béziers</name>
         <coordinates>43.350000 3.250000</coordinates>
         <location>
           <name>Béziers-Vias Airport</name>
@@ -13505,7 +13505,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Caen</_name>
+        <name>Caen</name>
         <coordinates>49.183333 -0.350000</coordinates>
         <location>
           <name>Caen</name>
@@ -13515,7 +13515,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Calvi</_name>
+        <name>Calvi</name>
         <coordinates>42.566667 8.750000</coordinates>
         <location>
           <name>Calvi</name>
@@ -13525,7 +13525,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Cambrai</_name>
+        <name>Cambrai</name>
         <coordinates>50.166667 3.233333</coordinates>
         <location>
           <name>Cambrai</name>
@@ -13535,7 +13535,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Cannes</_name>
+        <name>Cannes</name>
         <coordinates>43.550000 7.016667</coordinates>
         <location>
           <name>Cannes</name>
@@ -13545,7 +13545,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Carcassonne</_name>
+        <name>Carcassonne</name>
         <coordinates>43.216667 2.350000</coordinates>
         <location>
           <name>Carcassonne</name>
@@ -13555,7 +13555,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Cazaux</_name>
+        <name>Cazaux</name>
         <coordinates>44.533333 -1.150000</coordinates>
         <location>
           <name>Cazaux</name>
@@ -13565,7 +13565,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Chambéry</_name>
+        <name>Chambéry</name>
         <coordinates>45.600000 5.900000</coordinates>
         <location>
           <name>Chambéry-Aix-Les-Bains Airport</name>
@@ -13575,7 +13575,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Chartres</_name>
+        <name>Chartres</name>
         <coordinates>48.450000 1.500000</coordinates>
         <location>
           <name>Chartres</name>
@@ -13585,7 +13585,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Cherbourg</_name>
+        <name>Cherbourg</name>
         <coordinates>49.650000 -1.650000</coordinates>
         <location>
           <name>Cherbourg-Maupertus Airport</name>
@@ -13597,7 +13597,7 @@
         <!-- A city in France.
              One of several cities in France called "Châlons".
           -->
-        <_name>Châlons-en-Champagne</_name>
+        <name>Châlons-en-Champagne</name>
         <coordinates>48.950000 4.366667</coordinates>
         <location>
           <name>Chalons-Vatry</name>
@@ -13607,7 +13607,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Châteaudun</_name>
+        <name>Châteaudun</name>
         <coordinates>48.083333 1.333333</coordinates>
         <location>
           <name>Châteaudun</name>
@@ -13617,7 +13617,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Châteauroux</_name>
+        <name>Châteauroux</name>
         <coordinates>46.816667 1.700000</coordinates>
         <location>
           <name>Châteauroux</name>
@@ -13627,7 +13627,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Clermont-Ferrand</_name>
+        <name>Clermont-Ferrand</name>
         <coordinates>45.783333 3.083333</coordinates>
         <location>
           <name>Clermont-Ferrand</name>
@@ -13637,7 +13637,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Cognac</_name>
+        <name>Cognac</name>
         <coordinates>45.700000 -0.333333</coordinates>
         <location>
           <name>Cognac</name>
@@ -13647,7 +13647,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Colmar</_name>
+        <name>Colmar</name>
         <coordinates>48.083333 7.366667</coordinates>
         <location>
           <name>Colmar</name>
@@ -13657,7 +13657,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Creil</_name>
+        <name>Creil</name>
         <coordinates>49.266667 2.483333</coordinates>
         <location>
           <name>Creil Fafb</name>
@@ -13667,7 +13667,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Dax</_name>
+        <name>Dax</name>
         <coordinates>43.716667 -1.050000</coordinates>
         <location>
           <name>Dax</name>
@@ -13677,7 +13677,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Dijon</_name>
+        <name>Dijon</name>
         <coordinates>47.316667 5.016667</coordinates>
         <location>
           <name>Dijon</name>
@@ -13687,7 +13687,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Dinard</_name>
+        <name>Dinard</name>
         <coordinates>48.633333 -2.066667</coordinates>
         <location>
           <name>Dinard</name>
@@ -13697,7 +13697,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Dole</_name>
+        <name>Dole</name>
         <coordinates>47.100000 5.500000</coordinates>
         <location>
           <name>Dole Tavaux</name>
@@ -13707,7 +13707,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Dollemard</_name>
+        <name>Dollemard</name>
         <coordinates>49.516667 0.066667</coordinates>
         <location>
           <name>La Heve</name>
@@ -13717,7 +13717,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Grenoble</_name>
+        <name>Grenoble</name>
         <coordinates>45.166667 5.716667</coordinates>
         <location>
           <name>Grenoble-St. Geoirs Airport</name>
@@ -13727,7 +13727,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Hoëricourt</_name>
+        <name>Hoëricourt</name>
         <coordinates>48.633333 4.900000</coordinates>
         <location>
           <name>St-Dizier</name>
@@ -13737,7 +13737,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Hyères</_name>
+        <name>Hyères</name>
         <coordinates>43.116667 6.116667</coordinates>
         <location>
           <name>Hyères</name>
@@ -13747,7 +13747,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Mulhouse</_name>
+        <name>Mulhouse</name>
         <coordinates>47.583333 7.516667</coordinates>
         <location>
           <name>Bale-Mulhouse</name>
@@ -13757,7 +13757,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Istres</_name>
+        <name>Istres</name>
         <coordinates>43.516667 4.983333</coordinates>
         <location>
           <name>Istres</name>
@@ -13767,7 +13767,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>La Roche-sur-Yon</_name>
+        <name>La Roche-sur-Yon</name>
         <coordinates>46.666667 -1.433333</coordinates>
         <location>
           <name>La Roche-sur-Yon</name>
@@ -13777,7 +13777,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>La Rochelle</_name>
+        <name>La Rochelle</name>
         <coordinates>46.166667 -1.150000</coordinates>
         <location>
           <name>La Rochelle</name>
@@ -13787,7 +13787,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Lannion</_name>
+        <name>Lannion</name>
         <coordinates>48.733333 -3.466667</coordinates>
         <location>
           <name>Lannion-Servel Airport</name>
@@ -13797,7 +13797,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Le Mans</_name>
+        <name>Le Mans</name>
         <coordinates>48.000000 0.200000</coordinates>
         <location>
           <name>Le Mans</name>
@@ -13807,7 +13807,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Le Puy</_name>
+        <name>Le Puy</name>
         <coordinates>45.033333 3.883333</coordinates>
         <location>
           <name>Le Puy</name>
@@ -13817,7 +13817,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Lille</_name>
+        <name>Lille</name>
         <coordinates>50.633333 3.066667</coordinates>
         <location>
           <name>Lille</name>
@@ -13827,7 +13827,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Limoges</_name>
+        <name>Limoges</name>
         <coordinates>45.850000 1.250000</coordinates>
         <location>
           <name>Limoges</name>
@@ -13837,7 +13837,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Luxeuil-les-Bains</_name>
+        <name>Luxeuil-les-Bains</name>
         <coordinates>47.816667 6.383333</coordinates>
         <location>
           <name>Luxeuil-les-Bains</name>
@@ -13847,7 +13847,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Lyon</_name>
+        <name>Lyon</name>
         <coordinates>45.750000 4.850000</coordinates>
         <location>
           <name>Lyon-Bron Airport</name>
@@ -13862,7 +13862,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Marseille</_name>
+        <name>Marseille</name>
         <coordinates>43.300000 5.400000</coordinates>
         <location>
           <name>Marseille-Marignane Airport</name>
@@ -13872,7 +13872,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Melun</_name>
+        <name>Melun</name>
         <coordinates>48.533333 2.666667</coordinates>
         <location>
           <name>Melun</name>
@@ -13882,7 +13882,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Metz</_name>
+        <name>Metz</name>
         <coordinates>49.133333 6.166667</coordinates>
         <location>
           <name>Metz-Nancy-Lorraine</name>
@@ -13892,7 +13892,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Mont-de-Marsan</_name>
+        <name>Mont-de-Marsan</name>
         <coordinates>43.883333 -0.500000</coordinates>
         <location>
           <name>Mont-de-Marsan</name>
@@ -13902,7 +13902,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Montgauch</_name>
+        <name>Montgauch</name>
         <coordinates>43.000000 1.083333</coordinates>
         <location>
           <name>St-Girons</name>
@@ -13912,7 +13912,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Montpellier</_name>
+        <name>Montpellier</name>
         <coordinates>43.600000 3.883333</coordinates>
         <location>
           <name>Montpellier</name>
@@ -13922,7 +13922,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Montélimar</_name>
+        <name>Montélimar</name>
         <coordinates>44.566667 4.750000</coordinates>
         <location>
           <name>Montélimar</name>
@@ -13932,7 +13932,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Mâcon</_name>
+        <name>Mâcon</name>
         <coordinates>46.300000 4.833333</coordinates>
         <location>
           <name>Mâcon</name>
@@ -13942,7 +13942,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Méné Guen</_name>
+        <name>Méné Guen</name>
         <coordinates>47.783333 -3.433333</coordinates>
         <location>
           <name>Lann Bihoue</name>
@@ -13952,7 +13952,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Nancy</_name>
+        <name>Nancy</name>
         <coordinates>48.683333 6.200000</coordinates>
         <location>
           <name>Nancy-Essey Airport</name>
@@ -13967,7 +13967,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Nantes</_name>
+        <name>Nantes</name>
         <coordinates>47.216667 -1.550000</coordinates>
         <location>
           <name>Nantes</name>
@@ -13977,7 +13977,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Nevers</_name>
+        <name>Nevers</name>
         <coordinates>46.983333 3.166667</coordinates>
         <location>
           <name>Nevers</name>
@@ -13987,7 +13987,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Nice</_name>
+        <name>Nice</name>
         <coordinates>43.700000 7.250000</coordinates>
         <location>
           <name>Nice</name>
@@ -13997,7 +13997,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Nîmes</_name>
+        <name>Nîmes</name>
         <coordinates>43.833333 4.350000</coordinates>
         <location>
           <name>Nîmes-Garons Airport</name>
@@ -14007,7 +14007,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name msgctxt="City in France">Orange</_name>
+        <name msgctxt="City in France">Orange</name>
         <coordinates>44.133333 4.800000</coordinates>
         <location>
           <name>Orange</name>
@@ -14017,7 +14017,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Orléans</_name>
+        <name>Orléans</name>
         <coordinates>47.916667 1.900000</coordinates>
         <location>
           <name>Orléans</name>
@@ -14027,7 +14027,7 @@
       </city>
       <city>
         <!-- The capital of France -->
-        <_name msgctxt="City in France">Paris</_name>
+        <name msgctxt="City in France">Paris</name>
         <coordinates>48.866667 2.333333</coordinates>
         <location>
           <name>Paris-Le Bourget Airport</name>
@@ -14047,7 +14047,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Pau</_name>
+        <name>Pau</name>
         <coordinates>43.300000 -0.366667</coordinates>
         <location>
           <name>Pau</name>
@@ -14057,7 +14057,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Perpignan</_name>
+        <name>Perpignan</name>
         <coordinates>42.683333 2.883333</coordinates>
         <location>
           <name>Perpignan</name>
@@ -14067,7 +14067,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Poggiale</_name>
+        <name>Poggiale</name>
         <coordinates>41.516667 9.083333</coordinates>
         <location>
           <name>Figari</name>
@@ -14077,7 +14077,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Poitiers</_name>
+        <name>Poitiers</name>
         <coordinates>46.583333 0.333333</coordinates>
         <location>
           <name>Poitiers</name>
@@ -14087,7 +14087,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Quimper</_name>
+        <name>Quimper</name>
         <coordinates>48.000000 -4.100000</coordinates>
         <location>
           <name>Quimper</name>
@@ -14097,7 +14097,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Reims</_name>
+        <name>Reims</name>
         <coordinates>49.250000 4.033333</coordinates>
         <location>
           <name>Reims</name>
@@ -14107,7 +14107,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Rennes</_name>
+        <name>Rennes</name>
         <coordinates>48.083333 -1.683333</coordinates>
         <location>
           <name>Rennes</name>
@@ -14117,7 +14117,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Rodez</_name>
+        <name>Rodez</name>
         <coordinates>44.333333 2.566667</coordinates>
         <location>
           <name>Rodez</name>
@@ -14127,7 +14127,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Romorantin</_name>
+        <name>Romorantin</name>
         <coordinates>47.366667 1.750000</coordinates>
         <location>
           <name>Romorantin</name>
@@ -14137,7 +14137,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Rouen</_name>
+        <name>Rouen</name>
         <coordinates>49.433333 1.083333</coordinates>
         <location>
           <name>Rouen</name>
@@ -14147,7 +14147,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Saint-Brieuc</_name>
+        <name>Saint-Brieuc</name>
         <coordinates>48.516667 -2.783333</coordinates>
         <location>
           <name>Saint-Brieuc</name>
@@ -14157,7 +14157,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Saint-Quentin</_name>
+        <name>Saint-Quentin</name>
         <coordinates>49.850000 3.283333</coordinates>
         <location>
           <name>Saint-Quentin</name>
@@ -14167,7 +14167,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Saint-Yan</_name>
+        <name>Saint-Yan</name>
         <coordinates>46.416667 4.033333</coordinates>
         <location>
           <name>Saint-Yan</name>
@@ -14177,7 +14177,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Salon</_name>
+        <name>Salon</name>
         <coordinates>43.633333 5.100000</coordinates>
         <location>
           <name>Salon</name>
@@ -14187,7 +14187,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Strasbourg</_name>
+        <name>Strasbourg</name>
         <coordinates>48.583333 7.750000</coordinates>
         <location>
           <name>Strasbourg</name>
@@ -14197,7 +14197,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Tarbes</_name>
+        <name>Tarbes</name>
         <coordinates>43.233333 0.083333</coordinates>
         <location>
           <name>Tarbes Ossun Lourdes</name>
@@ -14207,7 +14207,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Toulouse</_name>
+        <name>Toulouse</name>
         <coordinates>43.600000 1.433333</coordinates>
         <location>
           <name>Toulouse-Blagnac Airport</name>
@@ -14222,7 +14222,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Tours</_name>
+        <name>Tours</name>
         <coordinates>47.383333 0.683333</coordinates>
         <location>
           <name>Tours</name>
@@ -14232,7 +14232,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Trignac</_name>
+        <name>Trignac</name>
         <coordinates>47.316667 -2.183333</coordinates>
         <location>
           <name>St-Nazaire</name>
@@ -14242,7 +14242,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Troyes</_name>
+        <name>Troyes</name>
         <coordinates>48.300000 4.083333</coordinates>
         <location>
           <name>Troyes</name>
@@ -14252,7 +14252,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Veauche</_name>
+        <name>Veauche</name>
         <coordinates>45.550000 4.283333</coordinates>
         <location>
           <name>St-Etienne Boutheon</name>
@@ -14262,7 +14262,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name msgctxt="City in France">Vichy</_name>
+        <name msgctxt="City in France">Vichy</name>
         <coordinates>46.116667 3.416667</coordinates>
         <location>
           <name>Vichy</name>
@@ -14272,7 +14272,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Vélizy</_name>
+        <name>Vélizy</name>
         <coordinates>48.800000 2.183333</coordinates>
         <location>
           <name>Vélizy</name>
@@ -14282,7 +14282,7 @@
       </city>
       <city>
         <!-- A city in France -->
-        <_name>Évreux</_name>
+        <name>Évreux</name>
         <coordinates>49.016667 1.150000</coordinates>
         <location>
           <name>Évreux</name>
@@ -14293,7 +14293,7 @@
     </country>
     <country>
       <!-- DE - Germany -->
-      <_name>Germany</_name>
+      <name>Germany</name>
       <!-- Could not find information about the following stations,
            which may be in Germany:
            EDFE EDJA 
@@ -14310,11 +14310,11 @@
       <tz-hint>Europe/Berlin</tz-hint>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name>Baden-Württemberg</_name>
+        <name>Baden-Württemberg</name>
         <fips-code>GM01</fips-code>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Donaueschingen</_name>
+          <name>Donaueschingen</name>
           <coordinates>47.950000 8.500000</coordinates>
           <location>
             <name>Donaueschingen / Villingen</name>
@@ -14324,7 +14324,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Friedrichshafen</_name>
+          <name>Friedrichshafen</name>
           <coordinates>47.650000 9.483333</coordinates>
           <location>
             <name>Friedrichshafen</name>
@@ -14334,7 +14334,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Karlsruhe</_name>
+          <name>Karlsruhe</name>
           <coordinates>49.004722 8.385833</coordinates>
           <location>
             <name>Karlsruhe, Baden Wurttemberg</name>
@@ -14344,7 +14344,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Lahr</_name>
+          <name>Lahr</name>
           <coordinates>48.350000 7.866667</coordinates>
           <location>
             <name>Lahr Air Force Base</name>
@@ -14354,7 +14354,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Laupheim</_name>
+          <name>Laupheim</name>
           <coordinates>48.233333 9.883333</coordinates>
           <location>
             <name>Laupheim</name>
@@ -14364,7 +14364,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Meßstetten</_name>
+          <name>Meßstetten</name>
           <coordinates>48.183333 8.966667</coordinates>
           <location>
             <name>Meßstetten</name>
@@ -14374,7 +14374,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Neuostheim</_name>
+          <name>Neuostheim</name>
           <coordinates>49.477500 8.514444</coordinates>
           <location>
             <name>Baden Wurttemberg</name>
@@ -14384,7 +14384,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name>Niederstetten</_name>
+          <name>Niederstetten</name>
           <coordinates>49.400000 9.919444</coordinates>
           <location>
             <name>Niederstetten</name>
@@ -14394,7 +14394,7 @@
         </city>
         <city>
           <!-- A city in Baden-Württemberg in Germany -->
-          <_name msgctxt="City in Baden-Württemberg, Germany">Stuttgart</_name>
+          <name msgctxt="City in Baden-Württemberg, Germany">Stuttgart</name>
           <coordinates>48.766667 9.183333</coordinates>
           <location>
             <name>Stuttgart-Echterdingen</name>
@@ -14408,11 +14408,11 @@
              use that unless you know that it has a different name in
              your language.
           -->
-        <_name>Bavaria</_name>
+        <name>Bavaria</name>
         <fips-code>GM02</fips-code>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Augsburg</_name>
+          <name>Augsburg</name>
           <coordinates>48.366667 10.883333</coordinates>
           <location>
             <name>Augsburg</name>
@@ -14422,7 +14422,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Dorfgmünd</_name>
+          <name>Dorfgmünd</name>
           <coordinates>49.700000 11.950000</coordinates>
           <location>
             <name>Grafenwoehr</name>
@@ -14432,7 +14432,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Hof</_name>
+          <name>Hof</name>
           <coordinates>50.316667 11.916667</coordinates>
           <location>
             <name>Hof</name>
@@ -14442,7 +14442,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Illesheim</_name>
+          <name>Illesheim</name>
           <coordinates>49.466667 10.383333</coordinates>
           <location>
             <name>Illesheim</name>
@@ -14452,7 +14452,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Katterbach</_name>
+          <name>Katterbach</name>
           <coordinates>49.316667 10.633333</coordinates>
           <location>
             <name>Ansbach / Katterbach</name>
@@ -14462,7 +14462,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Lager Lechfeld</_name>
+          <name>Lager Lechfeld</name>
           <coordinates>48.166667 10.850000</coordinates>
           <location>
             <name>Lager Lechfeld</name>
@@ -14472,7 +14472,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Landsberg</_name>
+          <name>Landsberg</name>
           <coordinates>48.050000 10.866667</coordinates>
           <location>
             <name>Landsberg</name>
@@ -14485,7 +14485,7 @@
                "Munich" is the traditional English name.
                The local name is "München".
             -->
-          <_name>Munich</_name>
+          <name>Munich</name>
           <coordinates>48.150000 11.583333</coordinates>
           <location>
             <name>Munich</name>
@@ -14497,7 +14497,7 @@
           <!-- A city in Bavaria in Germany.
                One of several cities in Germany called "Neuburg".
             -->
-          <_name>Neuburg an der Donau</_name>
+          <name>Neuburg an der Donau</name>
           <coordinates>48.733333 11.183333</coordinates>
           <location>
             <name>Neuburg an der Donau / Donau</name>
@@ -14510,7 +14510,7 @@
                "Nuremberg" is the traditional English name.
                The local name is "Nürnberg".
             -->
-          <_name>Nuremberg</_name>
+          <name>Nuremberg</name>
           <coordinates>49.447778 11.068333</coordinates>
           <location>
             <name>Nuernberg</name>
@@ -14520,7 +14520,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Oberpfaffenhofen</_name>
+          <name>Oberpfaffenhofen</name>
           <coordinates>48.066667 11.266667</coordinates>
           <location>
             <name>Oberpfaffenhofen</name>
@@ -14530,7 +14530,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Roth</_name>
+          <name>Roth</name>
           <coordinates>49.245000 11.091111</coordinates>
           <location>
             <name>Roth</name>
@@ -14540,7 +14540,7 @@
         </city>
         <city>
           <!-- A city in Bavaria in Germany -->
-          <_name>Würzburg</_name>
+          <name>Würzburg</name>
           <coordinates>49.787778 9.936111</coordinates>
           <location>
             <name>Niederstetten</name>
@@ -14551,11 +14551,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name msgctxt="State in Germany">Berlin</_name>
+        <name msgctxt="State in Germany">Berlin</name>
         <fips-code>GM16</fips-code>
         <city>
           <!-- The capital of Germany -->
-          <_name msgctxt="City in Berlin, Germany">Berlin</_name>
+          <name msgctxt="City in Berlin, Germany">Berlin</name>
           <coordinates>52.516667 13.400000</coordinates>
           <location>
             <name>Berlin-Tegel</name>
@@ -14571,16 +14571,16 @@
       </state>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name>Brandenburg</_name>
+        <name>Brandenburg</name>
         <fips-code>GM11</fips-code>
       </state>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name msgctxt="State in Germany">Bremen</_name>
+        <name msgctxt="State in Germany">Bremen</name>
         <fips-code>GM03</fips-code>
         <city>
           <!-- A city in Bremen in Germany -->
-          <_name msgctxt="City in Bremen, Germany">Bremen</_name>
+          <name msgctxt="City in Bremen, Germany">Bremen</name>
           <coordinates>53.083333 8.800000</coordinates>
           <location>
             <name>Bremen</name>
@@ -14591,11 +14591,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name msgctxt="State in Germany">Hamburg</_name>
+        <name msgctxt="State in Germany">Hamburg</name>
         <fips-code>GM04</fips-code>
         <city>
           <!-- A city in Hamburg in Germany -->
-          <_name msgctxt="City in Hamburg, Germany">Hamburg</_name>
+          <name msgctxt="City in Hamburg, Germany">Hamburg</name>
           <coordinates>53.550000 10.000000</coordinates>
           <location>
             <name>Hamburg-Fuhlsbuettel</name>
@@ -14614,11 +14614,11 @@
              use that unless you know that it has a different name in
              your language.
           -->
-        <_name>Hesse</_name>
+        <name>Hesse</name>
         <fips-code>GM05</fips-code>
         <city>
           <!-- A city in Hesse in Germany -->
-          <_name>Frankfurt</_name>
+          <name>Frankfurt</name>
           <coordinates>50.116667 8.683333</coordinates>
           <location>
             <name>Frankfurt</name>
@@ -14628,7 +14628,7 @@
         </city>
         <city>
           <!-- A city in Hesse in Germany -->
-          <_name>Fritzlar</_name>
+          <name>Fritzlar</name>
           <coordinates>51.133333 9.283333</coordinates>
           <location>
             <name>Fritzlar</name>
@@ -14638,7 +14638,7 @@
         </city>
         <city>
           <!-- A city in Hesse in Germany -->
-          <_name>Kassel</_name>
+          <name>Kassel</name>
           <coordinates>51.316667 9.500000</coordinates>
           <location>
             <name>Kassel / Calden</name>
@@ -14648,7 +14648,7 @@
         </city>
         <city>
           <!-- A city in Hesse in Germany -->
-          <_name>Wiesbaden</_name>
+          <name>Wiesbaden</name>
           <coordinates>50.083333 8.250000</coordinates>
           <location>
             <name>Wiesbaden</name>
@@ -14662,11 +14662,11 @@
              Please use that unless you know that it has a different
              name in your language.
           -->
-        <_name>Lower Saxony</_name>
+        <name>Lower Saxony</name>
         <fips-code>GM06</fips-code>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Achum</_name>
+          <name>Achum</name>
           <coordinates>52.283333 9.083333</coordinates>
           <location>
             <name>Bueckeburg</name>
@@ -14676,7 +14676,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Braunschweig</_name>
+          <name>Braunschweig</name>
           <coordinates>52.266667 10.533333</coordinates>
           <location>
             <name>Braunschweig</name>
@@ -14686,7 +14686,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Celle</_name>
+          <name>Celle</name>
           <coordinates>52.616667 10.083333</coordinates>
           <location>
             <name>Celle</name>
@@ -14696,7 +14696,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Faßberg</_name>
+          <name>Faßberg</name>
           <coordinates>52.900000 10.166667</coordinates>
           <location>
             <name>Faßberg</name>
@@ -14706,7 +14706,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Hannover</_name>
+          <name>Hannover</name>
           <coordinates>52.366667 9.716667</coordinates>
           <location>
             <name>Hannover</name>
@@ -14716,7 +14716,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Nordholz</_name>
+          <name>Nordholz</name>
           <coordinates>53.783333 8.600000</coordinates>
           <location>
             <name>Nordholz</name>
@@ -14726,7 +14726,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Webershausen</_name>
+          <name>Webershausen</name>
           <coordinates>53.550000 7.666667</coordinates>
           <location>
             <name>Wittmundhaven</name>
@@ -14736,7 +14736,7 @@
         </city>
         <city>
           <!-- A city in Lower Saxony in Germany -->
-          <_name>Wunstorf</_name>
+          <name>Wunstorf</name>
           <coordinates>52.433333 9.416667</coordinates>
           <location>
             <name>Wunstorf</name>
@@ -14750,11 +14750,11 @@
              "Mecklenburg-Vorpommern". Please use that unless you know
              that it has a different name in your language.
           -->
-        <_name>Mecklenburg-Western Pomerania</_name>
+        <name>Mecklenburg-Western Pomerania</name>
         <fips-code>GM12</fips-code>
         <city>
           <!-- A city in Mecklenburg-Western Pomerania in Germany -->
-          <_name>Laage</_name>
+          <name>Laage</name>
           <coordinates>53.933333 12.350000</coordinates>
           <location>
             <name>Laage</name>
@@ -14764,7 +14764,7 @@
         </city>
         <city>
           <!-- A city in Mecklenburg-Western Pomerania in Germany -->
-          <_name>Parchim</_name>
+          <name>Parchim</name>
           <coordinates>53.433333 11.850000</coordinates>
           <location>
             <name>Mecklenburg-Vorpommern</name>
@@ -14774,7 +14774,7 @@
         </city>
         <city>
           <!-- A city in Mecklenburg-Western Pomerania in Germany -->
-          <_name>Seebad Heringsdorf</_name>
+          <name>Seebad Heringsdorf</name>
           <coordinates>53.966667 14.166667</coordinates>
           <location>
             <name>Seebad Heringsdorf</name>
@@ -14784,7 +14784,7 @@
         </city>
         <city>
           <!-- A city in Mecklenburg-Western Pomerania in Germany -->
-          <_name>Trollenhagen</_name>
+          <name>Trollenhagen</name>
           <coordinates>53.600000 13.300000</coordinates>
           <location>
             <name>Trollenhagen</name>
@@ -14798,11 +14798,11 @@
              "Nordrhein-Westfalen". Please use that unless you know
              that it has a different name in your language.
           -->
-        <_name>North Rhine-Westphalia</_name>
+        <name>North Rhine-Westphalia</name>
         <fips-code>GM07</fips-code>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Baal</_name>
+          <name>Baal</name>
           <coordinates>51.616667 6.133333</coordinates>
           <location>
             <name>Niederrhein</name>
@@ -14812,7 +14812,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Bonn</_name>
+          <name>Bonn</name>
           <coordinates>50.733333 7.100000</coordinates>
           <location>
             <name>Cologne / Bonn</name>
@@ -14822,7 +14822,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Bredeck</_name>
+          <name>Bredeck</name>
           <coordinates>51.916667 8.300000</coordinates>
           <location>
             <name>Guetersloh</name>
@@ -14832,7 +14832,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Dortmund</_name>
+          <name>Dortmund</name>
           <coordinates>51.516667 7.450000</coordinates>
           <location>
             <name>Dortmund / Wickede</name>
@@ -14842,7 +14842,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Geilenkirchen</_name>
+          <name>Geilenkirchen</name>
           <coordinates>50.966667 6.116667</coordinates>
           <location>
             <name>Geilenkirchen</name>
@@ -14852,7 +14852,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Kalkar</_name>
+          <name>Kalkar</name>
           <coordinates>51.733333 6.300000</coordinates>
           <location>
             <name>Kalkar</name>
@@ -14862,7 +14862,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Kalkum</_name>
+          <name>Kalkum</name>
           <coordinates>51.300000 6.766667</coordinates>
           <location>
             <name>Duesseldorf</name>
@@ -14872,7 +14872,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Klemenshof</_name>
+          <name>Klemenshof</name>
           <coordinates>50.833333 6.666667</coordinates>
           <location>
             <name>Noervenich</name>
@@ -14882,7 +14882,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Mönchengladbach</_name>
+          <name>Mönchengladbach</name>
           <coordinates>51.200000 6.433333</coordinates>
           <location>
             <name>Mönchengladbach</name>
@@ -14892,7 +14892,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Münster</_name>
+          <name>Münster</name>
           <coordinates>51.966667 7.633333</coordinates>
           <location>
             <name>Münster / Osnabrueck</name>
@@ -14902,7 +14902,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Paderborn</_name>
+          <name>Paderborn</name>
           <coordinates>51.716667 8.766667</coordinates>
           <location>
             <name>Paderborn / Lippstadt</name>
@@ -14912,7 +14912,7 @@
         </city>
         <city>
           <!-- A city in North Rhine-Westphalia in Germany -->
-          <_name>Rheine</_name>
+          <name>Rheine</name>
           <coordinates>52.283333 7.450000</coordinates>
           <location>
             <name>Rheine-Bentlage</name>
@@ -14926,11 +14926,11 @@
              Please use that unless you know that it has a different
              name in your language.
           -->
-        <_name>Rhineland-Palatinate</_name>
+        <name>Rhineland-Palatinate</name>
         <fips-code>GM08</fips-code>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Büchel</_name>
+          <name>Büchel</name>
           <coordinates>50.166667 7.083333</coordinates>
           <location>
             <name>Buechel</name>
@@ -14940,7 +14940,7 @@
         </city>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Hahn</_name>
+          <name>Hahn</name>
           <coordinates>49.966667 7.266667</coordinates>
           <location>
             <name>Hahn</name>
@@ -14950,7 +14950,7 @@
         </city>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Liebenscheid</_name>
+          <name>Liebenscheid</name>
           <coordinates>50.700000 8.100000</coordinates>
           <location>
             <name>Hessen</name>
@@ -14960,7 +14960,7 @@
         </city>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Ramstein</_name>
+          <name>Ramstein</name>
           <coordinates>49.450000 7.533333</coordinates>
           <location>
             <name>Ramstein</name>
@@ -14970,7 +14970,7 @@
         </city>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Spangdahlem</_name>
+          <name>Spangdahlem</name>
           <coordinates>49.983333 6.683333</coordinates>
           <location>
             <name>Spangdahlem</name>
@@ -14980,7 +14980,7 @@
         </city>
         <city>
           <!-- A city in Rhineland-Palatinate in Germany -->
-          <_name>Zweibrücken</_name>
+          <name>Zweibrücken</name>
           <coordinates>49.250000 7.366667</coordinates>
           <location>
             <name>Zweibrücken, Rheinland-Pfalz</name>
@@ -14991,11 +14991,11 @@
       </state>
       <state>
         <!-- A state/province/territory in Germany -->
-        <_name>Saarland</_name>
+        <name>Saarland</name>
         <fips-code>GM09</fips-code>
         <city>
           <!-- A city in Saarland in Germany -->
-          <_name>Ensheim</_name>
+          <name>Ensheim</name>
           <coordinates>49.200000 7.100000</coordinates>
           <location>
             <name>Saarbruecken / Ensheim</name>
@@ -15009,11 +15009,11 @@
              use that unless you know that it has a different name in
              your language.
           -->
-        <_name>Saxony</_name>
+        <name>Saxony</name>
         <fips-code>GM13</fips-code>
         <city>
           <!-- A city in Saxony in Germany -->
-          <_name>Dresden</_name>
+          <name>Dresden</name>
           <coordinates>51.050000 13.750000</coordinates>
           <location>
             <name>Dresden-Klotzsche</name>
@@ -15023,7 +15023,7 @@
         </city>
         <city>
           <!-- A city in Saxony in Germany -->
-          <_name>Leipzig</_name>
+          <name>Leipzig</name>
           <coordinates>51.300000 12.333333</coordinates>
           <location>
             <name>Leipzig-Schkeuditz</name>
@@ -15037,11 +15037,11 @@
              Please use that unless you know that it has a different
              name in your language.
           -->
-        <_name>Saxony-Anhalt</_name>
+        <name>Saxony-Anhalt</name>
         <fips-code>GM14</fips-code>
         <city>
           <!-- A city in Saxony-Anhalt in Germany -->
-          <_name>Holzdorf</_name>
+          <name>Holzdorf</name>
           <coordinates>51.766667 13.133333</coordinates>
           <location>
             <name>Holzdorf</name>
@@ -15052,11 +15052,11 @@
       </state>
       <state>
         <!-- A state in Germany. The Danish name is "Slesvig-Holsten". -->
-        <_name>Schleswig-Holstein</_name>
+        <name>Schleswig-Holstein</name>
         <fips-code>GM10</fips-code>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Hohn</_name>
+          <name>Hohn</name>
           <coordinates>54.300000 9.500000</coordinates>
           <location>
             <name>Hohn</name>
@@ -15066,7 +15066,7 @@
         </city>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Kiel</_name>
+          <name>Kiel</name>
           <coordinates>54.333333 10.133333</coordinates>
           <location>
             <name>Holtenau Airport</name>
@@ -15076,7 +15076,7 @@
         </city>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Schleswig</_name>
+          <name>Schleswig</name>
           <coordinates>54.516667 9.550000</coordinates>
           <location>
             <name>Schleswig-Jagel</name>
@@ -15086,7 +15086,7 @@
         </city>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Ulstrupfeld</_name>
+          <name>Ulstrupfeld</name>
           <coordinates>54.833333 9.533333</coordinates>
           <location>
             <name>Gluecksburg / Meierwik</name>
@@ -15096,7 +15096,7 @@
         </city>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Vorrade</_name>
+          <name>Vorrade</name>
           <coordinates>53.816667 10.683333</coordinates>
           <location>
             <name>Luebeck-Blankensee</name>
@@ -15106,7 +15106,7 @@
         </city>
         <city>
           <!-- A city in Schleswig-Holstein in Germany -->
-          <_name>Westerland</_name>
+          <name>Westerland</name>
           <coordinates>54.900000 8.300000</coordinates>
           <location>
             <name>Westerland / Sylt</name>
@@ -15120,11 +15120,11 @@
              use that unless you know that it has a different name in
              your language.
           -->
-        <_name>Thuringia</_name>
+        <name>Thuringia</name>
         <fips-code>GM15</fips-code>
         <city>
           <!-- A city in Thuringia in Germany -->
-          <_name>Altenburg</_name>
+          <name>Altenburg</name>
           <coordinates>50.983333 12.450000</coordinates>
           <location>
             <name>Altenburg Nobitz</name>
@@ -15134,7 +15134,7 @@
         </city>
         <city>
           <!-- A city in Thuringia in Germany -->
-          <_name>Bindersleben</_name>
+          <name>Bindersleben</name>
           <coordinates>50.966667 10.950000</coordinates>
           <location>
             <name>Bindersleben</name>
@@ -15148,7 +15148,7 @@
       <!-- GI - Gibraltar, a British overseas territory on the southern
            tip of Spain.
         -->
-      <_name msgctxt="Country">Gibraltar</_name>
+      <name msgctxt="Country">Gibraltar</name>
       <iso-code>GI</iso-code>
       <fips-code>GI</fips-code>
       <timezones>
@@ -15157,7 +15157,7 @@
       <tz-hint>Europe/Gibraltar</tz-hint>
       <city>
         <!-- The capital of Gibraltar -->
-        <_name msgctxt="City in Gibraltar">Gibraltar</_name>
+        <name msgctxt="City in Gibraltar">Gibraltar</name>
         <coordinates>36.133333 -5.350000</coordinates>
         <location>
           <name>Gibraltar</name>
@@ -15168,7 +15168,7 @@
     </country>
     <country>
       <!-- GR - Greece -->
-      <_name>Greece</_name>
+      <name>Greece</name>
       <!-- Could not find information about the following stations,
            which may be in Greece:
            LGSY 
@@ -15181,7 +15181,7 @@
       <tz-hint>Europe/Athens</tz-hint>
       <city>
         <!-- A city in Greece -->
-        <_name>Alexandroúpolis</_name>
+        <name>Alexandroúpolis</name>
         <coordinates>40.847500 25.874444</coordinates>
         <location>
           <name>Alexandroúpolis Airport</name>
@@ -15191,7 +15191,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Andravída</_name>
+        <name>Andravída</name>
         <coordinates>37.900000 21.266667</coordinates>
         <location>
           <name>Andravída Airport</name>
@@ -15201,7 +15201,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Argostólion</_name>
+        <name>Argostólion</name>
         <coordinates>38.173056 20.481944</coordinates>
         <location>
           <name>Kefalhnia Airport</name>
@@ -15214,7 +15214,7 @@
              "Athens" is the traditional English name.
              The local name in Greek is "Athína / Αθήνα".
           -->
-        <_name msgctxt="City in Greece">Athens</_name>
+        <name msgctxt="City in Greece">Athens</name>
         <coordinates>37.983333 23.733333</coordinates>
         <location>
           <name>Athens Eleftherios Venizelos International Airport</name>
@@ -15224,7 +15224,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Chrysoúpolis</_name>
+        <name>Chrysoúpolis</name>
         <coordinates>40.985556 24.693889</coordinates>
         <location>
           <name>Chrysoúpolis Airport</name>
@@ -15236,7 +15236,7 @@
         <!-- A city in Greece.
              The name is also written "Χίος".
           -->
-        <_name>Chíos</_name>
+        <name>Chíos</name>
         <coordinates>38.367778 26.135833</coordinates>
         <location>
           <name>Chíos Airport</name>
@@ -15246,7 +15246,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Elefsís</_name>
+        <name>Elefsís</name>
         <coordinates>38.033333 23.533333</coordinates>
         <location>
           <name>Elefsís Airport</name>
@@ -15256,7 +15256,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Irákleion</_name>
+        <name>Irákleion</name>
         <coordinates>35.325000 25.130556</coordinates>
         <location>
           <name>Irákleion Airport</name>
@@ -15268,7 +15268,7 @@
         <!-- A city in Greece.
              The name is also written "Καλαμάτα".
           -->
-        <_name>Kalamáta</_name>
+        <name>Kalamáta</name>
         <coordinates>37.038889 22.114167</coordinates>
         <location>
           <name>Kalamáta Airport</name>
@@ -15278,7 +15278,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Karpásion</_name>
+        <name>Karpásion</name>
         <coordinates>39.933333 25.233333</coordinates>
         <location>
           <name>Limnos Airport</name>
@@ -15288,7 +15288,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Katomérion</_name>
+        <name>Katomérion</name>
         <coordinates>38.650000 20.783333</coordinates>
         <location>
           <name>Aktion Airport</name>
@@ -15298,7 +15298,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Kos</_name>
+        <name>Kos</name>
         <coordinates>36.893333 27.288889</coordinates>
         <location>
           <name>Kos Airport</name>
@@ -15308,7 +15308,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Kozáni</_name>
+        <name>Kozáni</name>
         <coordinates>40.301111 21.786389</coordinates>
         <location>
           <name>Kozáni Airport</name>
@@ -15318,7 +15318,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Kárpathos</_name>
+        <name>Kárpathos</name>
         <coordinates>35.500000 27.233333</coordinates>
         <location>
           <name>Kárpathos Airport</name>
@@ -15330,7 +15330,7 @@
         <!-- A city in Greece.
              The name is also written "Κέρκυρα".
           -->
-        <_name>Kérkyra</_name>
+        <name>Kérkyra</name>
         <coordinates>39.620000 19.919722</coordinates>
         <location>
           <name>Kérkyra Airport</name>
@@ -15342,7 +15342,7 @@
         <!-- A city in Greece.
              The name is also written "Κύθηρα".
           -->
-        <_name>Kýthira</_name>
+        <name>Kýthira</name>
         <coordinates>36.150000 22.992500</coordinates>
         <location>
           <name>Kýthira Airport</name>
@@ -15352,7 +15352,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Lárisa</_name>
+        <name>Lárisa</name>
         <coordinates>39.637222 22.420278</coordinates>
         <location>
           <name>Lárisa Airport</name>
@@ -15362,7 +15362,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Monólithos</_name>
+        <name>Monólithos</name>
         <coordinates>36.400000 25.483333</coordinates>
         <location>
           <name>Santorini Island</name>
@@ -15372,7 +15372,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Mytilíni</_name>
+        <name>Mytilíni</name>
         <coordinates>39.110000 26.554722</coordinates>
         <location>
           <name>Mytilíni Airport</name>
@@ -15384,7 +15384,7 @@
         <!-- A city in Greece.
              The name is also written "Μύκονος".
           -->
-        <_name>Mýkonos</_name>
+        <name>Mýkonos</name>
         <coordinates>37.450000 25.333333</coordinates>
         <location>
           <name>Mikonos Island, Mikonos Airport</name>
@@ -15394,7 +15394,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Náxos</_name>
+        <name>Náxos</name>
         <coordinates>37.105556 25.376389</coordinates>
         <location>
           <name>Cyclades Islands, Náxos Airport</name>
@@ -15404,7 +15404,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Paradeísion</_name>
+        <name>Paradeísion</name>
         <coordinates>36.400000 28.083333</coordinates>
         <location>
           <name>Rhodes Airport</name>
@@ -15414,7 +15414,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Páros</_name>
+        <name>Páros</name>
         <coordinates>37.083333 25.150000</coordinates>
         <location>
           <name>Paros Community Airport</name>
@@ -15424,7 +15424,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Skíathos</_name>
+        <name>Skíathos</name>
         <coordinates>39.166667 23.483333</coordinates>
         <location>
           <name>Skiathos Island</name>
@@ -15434,7 +15434,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Soúda</_name>
+        <name>Soúda</name>
         <coordinates>35.484444 24.074444</coordinates>
         <location>
           <name>Soúda Airport</name>
@@ -15444,7 +15444,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Sámos</_name>
+        <name>Sámos</name>
         <coordinates>37.757222 26.976944</coordinates>
         <location>
           <name>Sámos Airport</name>
@@ -15454,7 +15454,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Tanágra</_name>
+        <name>Tanágra</name>
         <coordinates>38.316667 23.533333</coordinates>
         <location>
           <name>Tanágra Airport</name>
@@ -15464,7 +15464,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Thessaloníki</_name>
+        <name>Thessaloníki</name>
         <coordinates>40.640278 22.943889</coordinates>
         <location>
           <name>Thessaloníki Airport</name>
@@ -15474,7 +15474,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Zákynthos</_name>
+        <name>Zákynthos</name>
         <coordinates>37.791389 20.895278</coordinates>
         <location>
           <name>Zákynthos Airport</name>
@@ -15484,7 +15484,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Áno Síros</_name>
+        <name>Áno Síros</name>
         <coordinates>37.450000 24.933333</coordinates>
         <location>
           <name>Áno Síros Airport</name>
@@ -15494,7 +15494,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Áraxos</_name>
+        <name>Áraxos</name>
         <coordinates>38.166667 21.416667</coordinates>
         <location>
           <name>Áraxos Airport</name>
@@ -15504,7 +15504,7 @@
       </city>
       <city>
         <!-- A city in Greece -->
-        <_name>Áyios Athanásios</_name>
+        <name>Áyios Athanásios</name>
         <coordinates>39.233333 22.766667</coordinates>
         <location>
           <name>Anchialos Airport</name>
@@ -15515,7 +15515,7 @@
     </country>
     <country>
       <!-- GG - The Bailiwick of Guernsey, a British Crown dependency -->
-      <_name>Guernsey</_name>
+      <name>Guernsey</name>
       <!-- Could not find information about the following stations,
            which may be in Guernsey:
            EGHK EGXX 
@@ -15524,13 +15524,13 @@
       <fips-code>GK</fips-code>
       <timezones>
         <timezone id="Europe/Guernsey">
-          <_name>GMT/BST</_name>
+          <name>GMT/BST</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Guernsey</tz-hint>
       <city>
         <!-- A city in Guernsey -->
-        <_name>Hautnez</_name>
+        <name>Hautnez</name>
         <coordinates>49.433333 -2.600000</coordinates>
         <location>
           <name>Guernsey Airport</name>
@@ -15540,7 +15540,7 @@
       </city>
       <city>
         <!-- The capital of Guernsey -->
-        <_name>Saint Peter Port</_name>
+        <name>Saint Peter Port</name>
         <coordinates>49.456111 -2.540833</coordinates>
         <location>
           <name>Guernsey Airport</name>
@@ -15551,7 +15551,7 @@
     </country>
     <country>
       <!-- HU - Hungary -->
-      <_name>Hungary</_name>
+      <name>Hungary</name>
       <!-- Could not find information about the following stations,
            which may be in Hungary:
            LHPR 
@@ -15564,7 +15564,7 @@
       <tz-hint>Europe/Budapest</tz-hint>
       <city>
         <!-- The capital of Hungary -->
-        <_name>Budapest</_name>
+        <name>Budapest</name>
         <coordinates>47.500000 19.083333</coordinates>
         <location>
           <name>Budapest-Ferihegy Airport</name>
@@ -15574,7 +15574,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Debrecen</_name>
+        <name>Debrecen</name>
         <coordinates>47.533333 21.633333</coordinates>
         <location>
           <name>Debrecen</name>
@@ -15584,7 +15584,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Kecskemét</_name>
+        <name>Kecskemét</name>
         <coordinates>46.900000 19.783333</coordinates>
         <location>
           <name>Kecskemét</name>
@@ -15594,7 +15594,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Pápa</_name>
+        <name>Pápa</name>
         <coordinates>47.333333 17.466667</coordinates>
         <location>
           <name>Pápa</name>
@@ -15604,7 +15604,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Pécs</_name>
+        <name>Pécs</name>
         <coordinates>46.083333 18.233333</coordinates>
         <location>
           <name>Pécs-Pogany Airport</name>
@@ -15614,7 +15614,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Szeged</_name>
+        <name>Szeged</name>
         <coordinates>46.250000 20.166667</coordinates>
         <location>
           <name>Szeged</name>
@@ -15624,7 +15624,7 @@
       </city>
       <city>
         <!-- A city in Hungary -->
-        <_name>Szolnok</_name>
+        <name>Szolnok</name>
         <coordinates>47.183333 20.200000</coordinates>
         <location>
           <name>Szolnok</name>
@@ -15635,7 +15635,7 @@
     </country>
     <country>
       <!-- IS - Iceland -->
-      <_name>Iceland</_name>
+      <name>Iceland</name>
       <iso-code>IS</iso-code>
       <fips-code>IC</fips-code>
       <timezones>
@@ -15644,7 +15644,7 @@
       <tz-hint>Atlantic/Reykjavik</tz-hint>
       <city>
         <!-- A city in Iceland -->
-        <_name>Akureyri</_name>
+        <name>Akureyri</name>
         <coordinates>65.666667 -18.100000</coordinates>
         <location>
           <name>Akureyri</name>
@@ -15654,7 +15654,7 @@
       </city>
       <city>
         <!-- A city in Iceland -->
-        <_name>Eiðar</_name>
+        <name>Eiðar</name>
         <coordinates>65.366667 -14.350000</coordinates>
         <location>
           <name>Egilsstadir</name>
@@ -15664,7 +15664,7 @@
       </city>
       <city>
         <!-- The capital of Iceland -->
-        <_name>Reykjavík</_name>
+        <name>Reykjavík</name>
         <coordinates>64.150000 -21.950000</coordinates>
         <location>
           <name>Reykjavík</name>
@@ -15674,7 +15674,7 @@
       </city>
       <city>
         <!-- A city in Iceland -->
-        <_name>Ytri-Njarðvík</_name>
+        <name>Ytri-Njarðvík</name>
         <coordinates>63.983333 -22.550000</coordinates>
         <location>
           <name>Keflavikurflugvollur</name>
@@ -15685,7 +15685,7 @@
     </country>
     <country>
       <!-- IE - Ireland -->
-      <_name>Ireland</_name>
+      <name>Ireland</name>
       <iso-code>IE</iso-code>
       <fips-code>EI</fips-code>
       <timezones>
@@ -15693,7 +15693,7 @@
           <!-- The time zone in Ireland (GMT in the winter, and Irish
                Summer Time in the summer.)
             -->
-          <_name>GMT/IST</_name>
+          <name>GMT/IST</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Dublin</tz-hint>
@@ -15701,7 +15701,7 @@
         <!-- A city in Ireland.
              The local name in Irish is "Corcaigh".
           -->
-        <_name>Cork</_name>
+        <name>Cork</name>
         <coordinates>51.898611 -8.495833</coordinates>
         <location>
           <name>Cork Airport</name>
@@ -15713,7 +15713,7 @@
         <!-- The capital of Ireland.
              The local name in Irish is "Baile Átha Cliath".
           -->
-        <_name msgctxt="City in Ireland">Dublin</_name>
+        <name msgctxt="City in Ireland">Dublin</name>
         <coordinates>53.333056 -6.248889</coordinates>
         <location>
           <name>Dublin Airport</name>
@@ -15725,7 +15725,7 @@
         <!-- A city in Ireland.
              The local name in Irish is "Dún Laoghaire".
           -->
-        <_name>Dunleary</_name>
+        <name>Dunleary</name>
         <coordinates>53.292500 -6.128611</coordinates>
         <location>
           <name>Dublin Airport</name>
@@ -15735,7 +15735,7 @@
       </city>
       <city>
         <!-- A city in Ireland -->
-        <_name>Glentavraun</_name>
+        <name>Glentavraun</name>
         <coordinates>53.883333 -8.800000</coordinates>
         <location>
           <name>Connaught</name>
@@ -15747,7 +15747,7 @@
         <!-- A city in Ireland.
              The local name in Irish is "Sionainn".
           -->
-        <_name>Shannon</_name>
+        <name>Shannon</name>
         <coordinates>52.703889 -8.864167</coordinates>
         <location>
           <name>Shannon Airport</name>
@@ -15758,18 +15758,18 @@
     </country>
     <country>
       <!-- IM - Isle of Man, a British Crown dependency -->
-      <_name>Isle of Man</_name>
+      <name>Isle of Man</name>
       <iso-code>IM</iso-code>
       <fips-code>IM</fips-code>
       <timezones>
         <timezone id="Europe/Isle_of_Man">
-          <_name>GMT/BST</_name>
+          <name>GMT/BST</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Isle_of_Man</tz-hint>
       <city>
         <!-- The capital of the Isle of Man -->
-        <_name msgctxt="City in Isle of Man">Douglas</_name>
+        <name msgctxt="City in Isle of Man">Douglas</name>
         <coordinates>54.150000 -4.483333</coordinates>
         <location>
           <name>Isle of Man, Ronaldsway Airport</name>
@@ -15780,7 +15780,7 @@
       </city>
       <city>
         <!-- A city in the Isle of Man -->
-        <_name>Ronaldsway</_name>
+        <name>Ronaldsway</name>
         <coordinates>54.083333 -4.616667</coordinates>
         <location>
           <name>Isle of Man, Ronaldsway Airport</name>
@@ -15792,7 +15792,7 @@
     </country>
     <country>
       <!-- IT - Italy -->
-      <_name>Italy</_name>
+      <name>Italy</name>
       <iso-code>IT</iso-code>
       <fips-code>IT</fips-code>
       <timezones>
@@ -15801,7 +15801,7 @@
       <tz-hint>Europe/Rome</tz-hint>
       <city>
         <!-- A city in Italy -->
-        <_name>Albenga</_name>
+        <name>Albenga</name>
         <coordinates>44.050000 8.216667</coordinates>
         <location>
           <name>Albenga</name>
@@ -15811,7 +15811,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Alghero</_name>
+        <name>Alghero</name>
         <coordinates>40.558889 8.318056</coordinates>
         <location>
           <name>Alghero</name>
@@ -15821,7 +15821,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Aviano</_name>
+        <name>Aviano</name>
         <coordinates>46.070556 12.594722</coordinates>
         <location>
           <name>Aviano</name>
@@ -15836,7 +15836,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Bari</_name>
+        <name>Bari</name>
         <coordinates>41.133333 16.850000</coordinates>
         <location>
           <name>Palese Macchie Airport</name>
@@ -15846,7 +15846,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Bergamo</_name>
+        <name>Bergamo</name>
         <coordinates>45.683333 9.716667</coordinates>
         <location>
           <name>Orio Al Serio Airport</name>
@@ -15856,7 +15856,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Bologna</_name>
+        <name>Bologna</name>
         <coordinates>44.493850 11.342400</coordinates>
         <location>
           <name>Borgo Panigale Airport</name>
@@ -15866,7 +15866,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Bolzano</_name>
+        <name>Bolzano</name>
         <coordinates>46.516667 11.366667</coordinates>
         <location>
           <name>Bolzano</name>
@@ -15876,7 +15876,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Brescia</_name>
+        <name>Brescia</name>
         <coordinates>45.550000 10.250000</coordinates>
         <location>
           <name>Ghedi Airport</name>
@@ -15891,7 +15891,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Breuil-Cervinia</_name>
+        <name>Breuil-Cervinia</name>
         <coordinates>45.933333 7.633333</coordinates>
         <location>
           <name>Pian Rosa</name>
@@ -15901,7 +15901,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Brindisi</_name>
+        <name>Brindisi</name>
         <coordinates>40.633333 17.933333</coordinates>
         <location>
           <name>Brindisi</name>
@@ -15911,7 +15911,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Cagliari</_name>
+        <name>Cagliari</name>
         <coordinates>39.216667 9.116667</coordinates>
         <location>
           <name>Elmas Airport</name>
@@ -15921,7 +15921,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Capri</_name>
+        <name>Capri</name>
         <coordinates>40.550000 14.233333</coordinates>
         <location>
           <name>Capri</name>
@@ -15931,7 +15931,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Case Arfel</_name>
+        <name>Case Arfel</name>
         <coordinates>44.250000 7.783333</coordinates>
         <location>
           <name>Monte Malanotte</name>
@@ -15941,7 +15941,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Catania</_name>
+        <name>Catania</name>
         <coordinates>37.500000 15.100000</coordinates>
         <location>
           <name>Fontanarossa Airport</name>
@@ -15956,7 +15956,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Cervia</_name>
+        <name>Cervia</name>
         <coordinates>44.261667 12.358889</coordinates>
         <location>
           <name>Cervia</name>
@@ -15966,7 +15966,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Crotone</_name>
+        <name>Crotone</name>
         <coordinates>39.083333 17.133333</coordinates>
         <location>
           <name>Crotone</name>
@@ -15976,7 +15976,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Cuneo</_name>
+        <name>Cuneo</name>
         <coordinates>44.383333 7.533333</coordinates>
         <location>
           <name>Levaldigi Airport</name>
@@ -15986,7 +15986,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Decimomannu</_name>
+        <name>Decimomannu</name>
         <coordinates>39.312500 8.969444</coordinates>
         <location>
           <name>Decimomannu</name>
@@ -15996,7 +15996,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Dobbiaco</_name>
+        <name>Dobbiaco</name>
         <coordinates>46.742500 12.231389</coordinates>
         <location>
           <name>Dobbiaco</name>
@@ -16006,7 +16006,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Ferrara</_name>
+        <name>Ferrara</name>
         <coordinates>44.833333 11.583333</coordinates>
         <location>
           <name>Ferrara</name>
@@ -16019,7 +16019,7 @@
              "Florence" is the traditional English name.
              The local name in Italian is "Firenze".
           -->
-        <_name msgctxt="City in Italy">Florence</_name>
+        <name msgctxt="City in Italy">Florence</name>
         <coordinates>43.766667 11.250000</coordinates>
         <location>
           <name>Peretola Airport</name>
@@ -16029,7 +16029,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Forlì</_name>
+        <name>Forlì</name>
         <coordinates>44.223611 12.052778</coordinates>
         <location>
           <name>Forlì</name>
@@ -16039,7 +16039,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Frosinone</_name>
+        <name>Frosinone</name>
         <coordinates>41.633333 13.316667</coordinates>
         <location>
           <name>Frosinone</name>
@@ -16052,7 +16052,7 @@
              "Genoa" is the traditional English name.
              The local name in Italian is "Genova".
           -->
-        <_name>Genoa</_name>
+        <name>Genoa</name>
         <coordinates>44.416667 8.950000</coordinates>
         <location>
           <name>Sestri Airport</name>
@@ -16062,7 +16062,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Ginosa Marina</_name>
+        <name>Ginosa Marina</name>
         <coordinates>40.433333 16.883333</coordinates>
         <location>
           <name>Ginosa Marina</name>
@@ -16072,7 +16072,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Gioia del Colle</_name>
+        <name>Gioia del Colle</name>
         <coordinates>40.800000 16.916667</coordinates>
         <location>
           <name>Gioia del Colle</name>
@@ -16082,7 +16082,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Grazzanise</_name>
+        <name>Grazzanise</name>
         <coordinates>41.083333 14.100000</coordinates>
         <location>
           <name>Grazzanise</name>
@@ -16092,7 +16092,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Grosseto</_name>
+        <name>Grosseto</name>
         <coordinates>42.766667 11.133333</coordinates>
         <location>
           <name>Grosseto</name>
@@ -16102,7 +16102,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Grottaglie</_name>
+        <name>Grottaglie</name>
         <coordinates>40.533333 17.433333</coordinates>
         <location>
           <name>Grottaglie</name>
@@ -16112,7 +16112,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Isola del Cantone</_name>
+        <name>Isola del Cantone</name>
         <coordinates>44.650000 8.950000</coordinates>
         <location>
           <name>Passo Dei Giovi</name>
@@ -16122,7 +16122,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Laigueglia</_name>
+        <name>Laigueglia</name>
         <coordinates>43.966667 8.150000</coordinates>
         <location>
           <name>Capo Mele</name>
@@ -16132,7 +16132,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Lampedusa</_name>
+        <name>Lampedusa</name>
         <coordinates>35.500000 12.600000</coordinates>
         <location>
           <name>Lampedusa</name>
@@ -16142,7 +16142,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Latina</_name>
+        <name>Latina</name>
         <coordinates>41.466667 12.866667</coordinates>
         <location>
           <name>Latina</name>
@@ -16152,7 +16152,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Lecce</_name>
+        <name>Lecce</name>
         <coordinates>40.383333 18.183333</coordinates>
         <location>
           <name>Lecce</name>
@@ -16162,7 +16162,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Messina</_name>
+        <name>Messina</name>
         <coordinates>38.183333 15.566667</coordinates>
         <location>
           <name>Messina</name>
@@ -16175,7 +16175,7 @@
              "Milan" is the traditional English name.
              The local name in Italian is "Milano".
           -->
-        <_name>Milan</_name>
+        <name>Milan</name>
         <coordinates>45.466667 9.200000</coordinates>
         <location>
           <name>Linate Airport</name>
@@ -16190,7 +16190,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Ancona</_name>
+        <name>Ancona</name>
         <coordinates>43.616530 13.518780</coordinates>
         <location>
           <name>Falconara Airport</name>
@@ -16203,7 +16203,7 @@
              "Naples" is the traditional English name.
              The local name in Italian is "Napoli".
           -->
-        <_name msgctxt="City in Italy">Naples</_name>
+        <name msgctxt="City in Italy">Naples</name>
         <coordinates>40.833333 14.250000</coordinates>
         <location>
           <name>Capodichino Airport</name>
@@ -16213,7 +16213,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Olbia</_name>
+        <name>Olbia</name>
         <coordinates>40.916667 9.516667</coordinates>
         <location>
           <name>Costa Smeralda Airport</name>
@@ -16223,7 +16223,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Palazzo</_name>
+        <name>Palazzo</name>
         <coordinates>42.716667 10.383333</coordinates>
         <location>
           <name>M. Calamita</name>
@@ -16233,7 +16233,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Palermo</_name>
+        <name>Palermo</name>
         <coordinates>38.116667 13.366667</coordinates>
         <location>
           <name>Punta Raisi Airport</name>
@@ -16243,7 +16243,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Paneveggio</_name>
+        <name>Paneveggio</name>
         <coordinates>46.300000 11.733333</coordinates>
         <location>
           <name>Passo Rolle</name>
@@ -16253,7 +16253,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Pantelleria</_name>
+        <name>Pantelleria</name>
         <coordinates>36.833333 11.950000</coordinates>
         <location>
           <name>Pantelleria</name>
@@ -16263,7 +16263,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Parma</_name>
+        <name>Parma</name>
         <coordinates>44.800000 10.333333</coordinates>
         <location>
           <name>Parma</name>
@@ -16273,7 +16273,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Perugia</_name>
+        <name>Perugia</name>
         <coordinates>43.133333 12.366667</coordinates>
         <location>
           <name>Perugia</name>
@@ -16283,7 +16283,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Pescara</_name>
+        <name>Pescara</name>
         <coordinates>42.466667 14.216667</coordinates>
         <location>
           <name>Pescara</name>
@@ -16293,7 +16293,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Piacenza</_name>
+        <name>Piacenza</name>
         <coordinates>45.016667 9.666667</coordinates>
         <location>
           <name>Piacenza</name>
@@ -16303,7 +16303,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Pisa</_name>
+        <name>Pisa</name>
         <coordinates>43.716667 10.383333</coordinates>
         <location>
           <name>S. Giusto Airport</name>
@@ -16313,7 +16313,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Pontecagnano</_name>
+        <name>Pontecagnano</name>
         <coordinates>40.633333 14.883333</coordinates>
         <location>
           <name>Pontecagnano Air Force Base</name>
@@ -16323,7 +16323,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Pratica di Mare</_name>
+        <name>Pratica di Mare</name>
         <coordinates>41.666667 12.483333</coordinates>
         <location>
           <name>Pratica di Mare</name>
@@ -16333,7 +16333,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Reggio di Calabria</_name>
+        <name>Reggio di Calabria</name>
         <coordinates>38.100000 15.650000</coordinates>
         <location>
           <name>Reggio di Calabria</name>
@@ -16343,7 +16343,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Resia</_name>
+        <name>Resia</name>
         <coordinates>46.833333 10.516667</coordinates>
         <location>
           <name>Resia Pass</name>
@@ -16353,7 +16353,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Rieti</_name>
+        <name>Rieti</name>
         <coordinates>42.400000 12.850000</coordinates>
         <location>
           <name>Rieti</name>
@@ -16363,7 +16363,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Rimini</_name>
+        <name>Rimini</name>
         <coordinates>44.063333 12.580833</coordinates>
         <location>
           <name>Rimini</name>
@@ -16376,7 +16376,7 @@
              "Rome" is the traditional English name.
              The local name in Italian is "Roma".
           -->
-        <_name msgctxt="City in Italy">Rome</_name>
+        <name msgctxt="City in Italy">Rome</name>
         <coordinates>41.900000 12.483333</coordinates>
         <location>
           <name>Urbe Airport</name>
@@ -16396,7 +16396,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Ronchi dei Legionari</_name>
+        <name>Ronchi dei Legionari</name>
         <coordinates>45.823611 13.509722</coordinates>
         <location>
           <name>Ronchi dei Legionari</name>
@@ -16406,7 +16406,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Salignano</_name>
+        <name>Salignano</name>
         <coordinates>39.833333 18.350000</coordinates>
         <location>
           <name>S. Maria di Leuca</name>
@@ -16416,7 +16416,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>San Stèfano</_name>
+        <name>San Stèfano</name>
         <coordinates>39.107500 9.506111</coordinates>
         <location>
           <name>Capo Carbonara</name>
@@ -16426,7 +16426,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Sant'Eufemia Lamezia</_name>
+        <name>Sant'Eufemia Lamezia</name>
         <coordinates>38.916667 16.250000</coordinates>
         <location>
           <name>Lamezia Terme</name>
@@ -16436,7 +16436,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Sporminore</_name>
+        <name>Sporminore</name>
         <coordinates>46.166667 11.033333</coordinates>
         <location>
           <name>Paganella</name>
@@ -16446,7 +16446,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Tamaricciola</_name>
+        <name>Tamaricciola</name>
         <coordinates>41.416667 15.733333</coordinates>
         <location>
           <name>Amendola</name>
@@ -16456,7 +16456,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Tarvisio</_name>
+        <name>Tarvisio</name>
         <coordinates>46.510833 13.594167</coordinates>
         <location>
           <name>Tarvisio</name>
@@ -16466,7 +16466,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Trapani</_name>
+        <name>Trapani</name>
         <coordinates>38.016667 12.483333</coordinates>
         <location>
           <name>Birgi Airport</name>
@@ -16476,7 +16476,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Trevico</_name>
+        <name>Trevico</name>
         <coordinates>41.050000 15.216667</coordinates>
         <location>
           <name>Trevico</name>
@@ -16486,7 +16486,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Treviso</_name>
+        <name>Treviso</name>
         <coordinates>45.666667 12.245000</coordinates>
         <location>
           <name>S. Angelo Airport</name>
@@ -16501,7 +16501,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Trieste</_name>
+        <name>Trieste</name>
         <coordinates>45.648611 13.780000</coordinates>
         <location>
           <name>Trieste</name>
@@ -16514,7 +16514,7 @@
              "Turin" is the traditional English name.
              The local name is "Torino".
           -->
-        <_name>Turin</_name>
+        <name>Turin</name>
         <coordinates>45.050000 7.666667</coordinates>
         <location>
           <name>Caselle Airport</name>
@@ -16527,7 +16527,7 @@
              "Venice" is the traditional English name.
              The local name in Italian is "Venezia".
           -->
-        <_name>Venice</_name>
+        <name>Venice</name>
         <coordinates>45.438611 12.326667</coordinates>
         <location>
           <name>Tessera Airport</name>
@@ -16537,7 +16537,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Verona</_name>
+        <name>Verona</name>
         <coordinates>45.450000 11.000000</coordinates>
         <location>
           <name>Villafranca Airport</name>
@@ -16547,7 +16547,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Viterbo</_name>
+        <name>Viterbo</name>
         <coordinates>42.416667 12.100000</coordinates>
         <location>
           <name>Viterbo</name>
@@ -16557,7 +16557,7 @@
       </city>
       <city>
         <!-- A city in Italy -->
-        <_name>Àrbatax</_name>
+        <name>Àrbatax</name>
         <coordinates>39.934444 9.705556</coordinates>
         <location>
           <name>Capo Bellavista</name>
@@ -16568,18 +16568,18 @@
     </country>
     <country>
       <!-- JE - The Bailiwick of Jersey, a British Crown dependency -->
-      <_name>Jersey</_name>
+      <name>Jersey</name>
       <iso-code>JE</iso-code>
       <fips-code>JE</fips-code>
       <timezones>
         <timezone id="Europe/Jersey">
-          <_name>GMT/BST</_name>
+          <name>GMT/BST</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Jersey</tz-hint>
       <city>
         <!-- A city in Jersey -->
-        <_name>La Hougue</_name>
+        <name>La Hougue</name>
         <coordinates>49.216667 -2.216667</coordinates>
         <location>
           <name>Jersey Airport</name>
@@ -16589,7 +16589,7 @@
       </city>
       <city>
         <!-- The capital of Jersey -->
-        <_name>Saint Helier</_name>
+        <name>Saint Helier</name>
         <coordinates>49.183333 -2.100000</coordinates>
         <location>
           <name>Jersey Airport</name>
@@ -16600,7 +16600,7 @@
     </country>
     <country>
       <!-- LV - Latvia -->
-      <_name>Latvia</_name>
+      <name>Latvia</name>
       <!-- Could not find information about the following stations,
            which may be in Latvia:
            EVVA 
@@ -16613,7 +16613,7 @@
       <tz-hint>Europe/Riga</tz-hint>
       <city>
         <!-- A city in Latvia -->
-        <_name>Liepāja</_name>
+        <name>Liepāja</name>
         <coordinates>56.516667 21.016667</coordinates>
         <location>
           <name>Liepāja International Airport</name>
@@ -16623,7 +16623,7 @@
       </city>
       <city>
         <!-- The capital of Latvia -->
-        <_name>Rīga</_name>
+        <name>Rīga</name>
         <coordinates>56.950000 24.100000</coordinates>
         <location>
           <name>Rīga International Airport</name>
@@ -16634,7 +16634,7 @@
     </country>
     <country>
       <!-- LI - Liechtenstien -->
-      <_name>Liechtenstein</_name>
+      <name>Liechtenstein</name>
       <!-- Could not find information about the following stations,
            which may be in Liechtenstein:
            LOXN 
@@ -16647,7 +16647,7 @@
       <tz-hint>Europe/Vaduz</tz-hint>
       <city>
         <!-- The capital of Liechtenstein -->
-        <_name>Vaduz</_name>
+        <name>Vaduz</name>
         <coordinates>47.133333 9.516667</coordinates>
         <location>
           <name>Hohenems-Dornbirn</name>
@@ -16658,7 +16658,7 @@
     </country>
     <country>
       <!-- LT - Lithuania -->
-      <_name>Lithuania</_name>
+      <name>Lithuania</name>
       <iso-code>LT</iso-code>
       <fips-code>LH</fips-code>
       <timezones>
@@ -16667,7 +16667,7 @@
       <tz-hint>Europe/Vilnius</tz-hint>
       <city>
         <!-- A city in Lithuania -->
-        <_name>Kaunas</_name>
+        <name>Kaunas</name>
         <coordinates>54.900000 23.900000</coordinates>
         <location>
           <name>Kaunas</name>
@@ -16677,7 +16677,7 @@
       </city>
       <city>
         <!-- A city in Lithuania -->
-        <_name>Palanga</_name>
+        <name>Palanga</name>
         <coordinates>55.917500 21.068611</coordinates>
         <location>
           <name>Palanga International Airport</name>
@@ -16687,7 +16687,7 @@
       </city>
       <city>
         <!-- The capital of Lithuania -->
-        <_name>Vilnius</_name>
+        <name>Vilnius</name>
         <coordinates>54.683333 25.316667</coordinates>
         <location>
           <name>Vilnius</name>
@@ -16697,7 +16697,7 @@
       </city>
       <city>
         <!-- A city in Lithuania -->
-        <_name>Šiauliai</_name>
+        <name>Šiauliai</name>
         <coordinates>55.933333 23.316667</coordinates>
         <location>
           <name>Siauliai International / Military Base</name>
@@ -16708,7 +16708,7 @@
     </country>
     <country>
       <!-- LU - Luxembourg -->
-      <_name msgctxt="Country">Luxembourg</_name>
+      <name msgctxt="Country">Luxembourg</name>
       <iso-code>LU</iso-code>
       <fips-code>LU</fips-code>
       <timezones>
@@ -16717,7 +16717,7 @@
       <tz-hint>Europe/Luxembourg</tz-hint>
       <city>
         <!-- The capital of Luxembourg -->
-        <_name msgctxt="City in Luxembourg">Luxembourg</_name>
+        <name msgctxt="City in Luxembourg">Luxembourg</name>
         <coordinates>49.611667 6.130000</coordinates>
         <location>
           <name>Luxembourg Airport</name>
@@ -16728,7 +16728,7 @@
     </country>
     <country>
       <!-- MK - The Former Yugoslav Republic of Macedonia -->
-      <_name>Macedonia</_name>
+      <name>Macedonia</name>
       <iso-code>MK</iso-code>
       <fips-code>MK</fips-code>
       <timezones>
@@ -16737,7 +16737,7 @@
       <tz-hint>Europe/Skopje</tz-hint>
       <city>
         <!-- A city in Macedonia -->
-        <_name>Ohrid</_name>
+        <name>Ohrid</name>
         <coordinates>41.117222 20.801944</coordinates>
         <location>
           <name>Ohrid</name>
@@ -16747,7 +16747,7 @@
       </city>
       <city>
         <!-- The capital of Macedonia -->
-        <_name>Skopje</_name>
+        <name>Skopje</name>
         <coordinates>42.000000 21.433333</coordinates>
         <location>
           <name>Skopje-Petrovec</name>
@@ -16758,7 +16758,7 @@
     </country>
     <country>
       <!-- MT - Malta -->
-      <_name msgctxt="Country">Malta</_name>
+      <name msgctxt="Country">Malta</name>
       <iso-code>MT</iso-code>
       <fips-code>MT</fips-code>
       <timezones>
@@ -16767,7 +16767,7 @@
       <tz-hint>Europe/Malta</tz-hint>
       <city>
         <!-- A city in Malta -->
-        <_name>Luqa</_name>
+        <name>Luqa</name>
         <coordinates>35.858889 14.488611</coordinates>
         <location>
           <name>Luqa</name>
@@ -16777,7 +16777,7 @@
       </city>
       <city>
         <!-- The capital of Malta -->
-        <_name>Valletta</_name>
+        <name>Valletta</name>
         <coordinates>35.899722 14.514722</coordinates>
         <location>
           <name>Luqa</name>
@@ -16788,7 +16788,7 @@
     </country>
     <country>
       <!-- MD - Moldova -->
-      <_name>Moldova</_name>
+      <name>Moldova</name>
       <iso-code>MD</iso-code>
       <fips-code>MD</fips-code>
       <timezones>
@@ -16797,7 +16797,7 @@
       <tz-hint>Europe/Chisinau</tz-hint>
       <city>
         <!-- The capital of Moldova -->
-        <_name>Chişinău</_name>
+        <name>Chişinău</name>
         <coordinates>47.005556 28.857500</coordinates>
         <location>
           <name>Chişinău International Airport</name>
@@ -16808,7 +16808,7 @@
     </country>
     <country>
       <!-- MC - Monaco -->
-      <_name msgctxt="Country">Monaco</_name>
+      <name msgctxt="Country">Monaco</name>
       <!-- Could not find information about the following stations,
            which may be in Monaco:
            LFAQ LFDB LFJR LFLP LFMV LFRG 
@@ -16821,7 +16821,7 @@
       <tz-hint>Europe/Monaco</tz-hint>
       <city>
         <!-- The capital of Monaco -->
-        <_name msgctxt="City in Monaco">Monaco</_name>
+        <name msgctxt="City in Monaco">Monaco</name>
         <coordinates>43.733333 7.416667</coordinates>
         <location>
           <name>Nice</name>
@@ -16832,7 +16832,7 @@
     </country>
     <country>
       <!-- ME - Montenegro -->
-      <_name>Montenegro</_name>
+      <name>Montenegro</name>
       <!-- Could not find information about the following stations,
            which may be in Montenegro:
            LYBT LYKV LYUZ 
@@ -16845,7 +16845,7 @@
       <tz-hint>Europe/Podgorica</tz-hint>
       <city>
         <!-- A city in Montenegro -->
-        <_name>Podgorica</_name>
+        <name>Podgorica</name>
         <coordinates>42.441111 19.263611</coordinates>
         <location>
           <name>Podgorica Titograd</name>
@@ -16855,7 +16855,7 @@
       </city>
       <city>
         <!-- A city in Montenegro -->
-        <_name>Tivat</_name>
+        <name>Tivat</name>
         <coordinates>42.436389 18.696111</coordinates>
         <location>
           <name>Tivat</name>
@@ -16866,7 +16866,7 @@
     </country>
     <country>
       <!-- NL - Netherlands -->
-      <_name>Netherlands</_name>
+      <name>Netherlands</name>
       <!-- Could not find information about the following stations,
            which may be in Netherlands:
            EHFZ EHJR EHSA EHSC 
@@ -16879,7 +16879,7 @@
       <tz-hint>Europe/Amsterdam</tz-hint>
       <city>
         <!-- The capital of the Netherlands -->
-        <_name>Amsterdam</_name>
+        <name>Amsterdam</name>
         <coordinates>52.350000 4.916667</coordinates>
         <location>
           <name>Schiphol Airport</name>
@@ -16889,7 +16889,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>De Kooy</_name>
+        <name>De Kooy</name>
         <coordinates>52.916667 4.800000</coordinates>
         <location>
           <name>De Kooy</name>
@@ -16899,7 +16899,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Deelen</_name>
+        <name>Deelen</name>
         <coordinates>52.066667 5.900000</coordinates>
         <location>
           <name>Deelen</name>
@@ -16909,7 +16909,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Eindhoven</_name>
+        <name>Eindhoven</name>
         <coordinates>51.450000 5.466667</coordinates>
         <location>
           <name>Eindhoven</name>
@@ -16919,7 +16919,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Gilze</_name>
+        <name>Gilze</name>
         <coordinates>51.550000 4.950000</coordinates>
         <location>
           <name>Gilze-Rijen</name>
@@ -16929,7 +16929,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Groningen</_name>
+        <name>Groningen</name>
         <coordinates>53.216667 6.550000</coordinates>
         <location>
           <name>Eelde Airport</name>
@@ -16939,7 +16939,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Leeuwarden</_name>
+        <name>Leeuwarden</name>
         <coordinates>53.200000 5.783333</coordinates>
         <location>
           <name>Leeuwarden</name>
@@ -16949,7 +16949,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Maastricht</_name>
+        <name>Maastricht</name>
         <coordinates>50.850000 5.683333</coordinates>
         <location>
           <name>Zuid Limburg Airport</name>
@@ -16959,7 +16959,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Oost-Vlieland</_name>
+        <name>Oost-Vlieland</name>
         <coordinates>53.283333 5.066667</coordinates>
         <location>
           <name>Vlieland</name>
@@ -16969,7 +16969,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Rotterdam</_name>
+        <name>Rotterdam</name>
         <coordinates>51.916667 4.500000</coordinates>
         <location>
           <name>Zestienhoven Airport</name>
@@ -16982,7 +16982,7 @@
              "The Hague" is the traditional English name.
              The local name in Dutch is "'s-Gravenhage".
           -->
-        <_name>The Hague</_name>
+        <name>The Hague</name>
         <coordinates>52.083333 4.300000</coordinates>
         <location>
           <name>Valkenburg</name>
@@ -16992,7 +16992,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Valkenburg</_name>
+        <name>Valkenburg</name>
         <coordinates>52.183333 4.433333</coordinates>
         <location>
           <name>Valkenburg</name>
@@ -17002,7 +17002,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Volkel</_name>
+        <name>Volkel</name>
         <coordinates>51.650000 5.650000</coordinates>
         <location>
           <name>Volkel</name>
@@ -17012,7 +17012,7 @@
       </city>
       <city>
         <!-- A city in the Netherlands -->
-        <_name>Woensdrecht</_name>
+        <name>Woensdrecht</name>
         <coordinates>51.433333 4.300000</coordinates>
         <location>
           <name>Woensdrecht</name>
@@ -17023,7 +17023,7 @@
     </country>
     <country>
       <!-- NO - Norway -->
-      <_name>Norway</_name>
+      <name>Norway</name>
       <!-- Could not find cities for the following weather stations:
            ENDR - Draugen (64.355556 7.791667)
            ENHE - Heidrun (65.325000 2.326667)
@@ -17036,7 +17036,7 @@
       <tz-hint>Europe/Oslo</tz-hint>
       <city>
         <!-- A city in Norway -->
-        <_name>Alta</_name>
+        <name>Alta</name>
         <coordinates>69.966667 23.241667</coordinates>
         <location>
           <name>Alta Airport</name>
@@ -17046,7 +17046,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Berlevåg</_name>
+        <name>Berlevåg</name>
         <coordinates>70.850000 29.100000</coordinates>
         <location>
           <name>Berlevåg</name>
@@ -17056,7 +17056,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Bodø</_name>
+        <name>Bodø</name>
         <coordinates>67.283333 14.383333</coordinates>
         <location>
           <name>Bodo Vi</name>
@@ -17066,7 +17066,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Bolle</_name>
+        <name>Bolle</name>
         <coordinates>68.158611 13.596389</coordinates>
         <location>
           <name>Leknes</name>
@@ -17076,7 +17076,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Boltåsen</_name>
+        <name>Boltåsen</name>
         <coordinates>68.533333 16.700000</coordinates>
         <location>
           <name>Evenes</name>
@@ -17086,7 +17086,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Brønnøysund</_name>
+        <name>Brønnøysund</name>
         <coordinates>65.466667 12.216667</coordinates>
         <location>
           <name>Brønnøysundsund Airport</name>
@@ -17096,7 +17096,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Båtsfjord</_name>
+        <name>Båtsfjord</name>
         <coordinates>70.632222 29.699722</coordinates>
         <location>
           <name>Båtsfjord</name>
@@ -17106,7 +17106,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Dalem</_name>
+        <name>Dalem</name>
         <coordinates>69.066667 18.516667</coordinates>
         <location>
           <name>Bardufoss</name>
@@ -17116,7 +17116,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Djupdalen</_name>
+        <name>Djupdalen</name>
         <coordinates>63.700000 9.583333</coordinates>
         <location>
           <name>Orland</name>
@@ -17126,7 +17126,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Eldskog</_name>
+        <name>Eldskog</name>
         <coordinates>70.050000 25.000000</coordinates>
         <location>
           <name>Banak</name>
@@ -17136,7 +17136,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Fagernes</_name>
+        <name>Fagernes</name>
         <coordinates>60.983333 9.250000</coordinates>
         <location>
           <name>Fagernes Leirin</name>
@@ -17146,7 +17146,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Fiskenes</_name>
+        <name>Fiskenes</name>
         <coordinates>69.263611 16.176667</coordinates>
         <location>
           <name>Andoya</name>
@@ -17156,7 +17156,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Flesland</_name>
+        <name>Flesland</name>
         <coordinates>60.293889 5.215278</coordinates>
         <location>
           <name>Bergen Airport</name>
@@ -17166,7 +17166,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Florø</_name>
+        <name>Florø</name>
         <coordinates>61.600000 5.000000</coordinates>
         <location>
           <name>Florø</name>
@@ -17176,7 +17176,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Førde</_name>
+        <name>Førde</name>
         <coordinates>61.450000 5.866667</coordinates>
         <location>
           <name>Førde Airport, Bringeland</name>
@@ -17186,7 +17186,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Gardermoen</_name>
+        <name>Gardermoen</name>
         <coordinates>60.216667 11.100000</coordinates>
         <location>
           <name>Oslo Airport</name>
@@ -17196,7 +17196,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Hammerfest</_name>
+        <name>Hammerfest</name>
         <coordinates>70.661667 23.688333</coordinates>
         <location>
           <name>Hammerfest</name>
@@ -17206,7 +17206,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Hasvik</_name>
+        <name>Hasvik</name>
         <coordinates>70.483333 22.150000</coordinates>
         <location>
           <name>Hasvik</name>
@@ -17216,7 +17216,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Haugesund</_name>
+        <name>Haugesund</name>
         <coordinates>59.411944 5.277500</coordinates>
         <location>
           <name>Haugesund Airport, Karmoy</name>
@@ -17226,7 +17226,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Holm</_name>
+        <name>Holm</name>
         <coordinates>61.150000 7.166667</coordinates>
         <location>
           <name>Sogndal Airport, Haukasen</name>
@@ -17236,7 +17236,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Honningsvåg</_name>
+        <name>Honningsvåg</name>
         <coordinates>70.983333 25.983333</coordinates>
         <location>
           <name>Honningsvåg Airport, Valan</name>
@@ -17246,7 +17246,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Kirkenes</_name>
+        <name>Kirkenes</name>
         <coordinates>69.725000 30.051667</coordinates>
         <location>
           <name>Kirkenes Airport</name>
@@ -17256,7 +17256,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Kjevik</_name>
+        <name>Kjevik</name>
         <coordinates>58.200000 8.100000</coordinates>
         <location>
           <name>Kristiansand Airport</name>
@@ -17266,7 +17266,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Kristiansund</_name>
+        <name>Kristiansund</name>
         <coordinates>63.116667 7.750000</coordinates>
         <location>
           <name>Kristiansund Airport, Kvernberget</name>
@@ -17276,7 +17276,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Tromsø</_name>
+        <name>Tromsø</name>
         <coordinates>69.666667 18.916667</coordinates>
         <location>
           <name>Langnes Airport</name>
@@ -17286,7 +17286,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Mehamn</_name>
+        <name>Mehamn</name>
         <coordinates>71.033333 27.850000</coordinates>
         <location>
           <name>Mehamn</name>
@@ -17296,7 +17296,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Molde</_name>
+        <name>Molde</name>
         <coordinates>62.733333 7.183333</coordinates>
         <location>
           <name>Molde Airport, Aro</name>
@@ -17306,7 +17306,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Mosjøen</_name>
+        <name>Mosjøen</name>
         <coordinates>65.833333 13.200000</coordinates>
         <location>
           <name>Mosjoen Kjaerstad</name>
@@ -17316,7 +17316,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Namsos</_name>
+        <name>Namsos</name>
         <coordinates>64.483333 11.500000</coordinates>
         <location>
           <name>Namsos Airport</name>
@@ -17326,7 +17326,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Narvik</_name>
+        <name>Narvik</name>
         <coordinates>68.435556 17.437222</coordinates>
         <location>
           <name>Narvik</name>
@@ -17336,7 +17336,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Notodden</_name>
+        <name>Notodden</name>
         <coordinates>59.566667 9.283333</coordinates>
         <location>
           <name>Notodden</name>
@@ -17346,7 +17346,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Oseberg</_name>
+        <name>Oseberg</name>
         <coordinates>59.316667 10.450000</coordinates>
         <location>
           <name>Oseberg</name>
@@ -17356,7 +17356,7 @@
       </city>
       <city>
         <!-- The capital of Norway -->
-        <_name>Oslo</_name>
+        <name>Oslo</name>
         <coordinates>59.916667 10.750000</coordinates>
         <location>
           <name>Oslo Airport, Gardermoen</name>
@@ -17366,7 +17366,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Rygge</_name>
+        <name>Rygge</name>
         <coordinates>59.383333 10.716667</coordinates>
         <location>
           <name>Rygge</name>
@@ -17376,7 +17376,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Røros</_name>
+        <name>Røros</name>
         <coordinates>62.583333 11.400000</coordinates>
         <location>
           <name>Røros Airport</name>
@@ -17386,7 +17386,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Rørvik</_name>
+        <name>Rørvik</name>
         <coordinates>64.850000 11.233333</coordinates>
         <location>
           <name>Rørvik Airport, Ryum</name>
@@ -17396,7 +17396,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Røssvoll</_name>
+        <name>Røssvoll</name>
         <coordinates>66.366667 14.333333</coordinates>
         <location>
           <name>Mo I Rana Airport</name>
@@ -17406,7 +17406,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Røst</_name>
+        <name>Røst</name>
         <coordinates>67.516667 12.116667</coordinates>
         <location>
           <name>Rost Flyplass</name>
@@ -17416,7 +17416,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Sandane</_name>
+        <name>Sandane</name>
         <coordinates>61.766667 6.216667</coordinates>
         <location>
           <name>Sandane Airport, Anda</name>
@@ -17426,7 +17426,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Skagen</_name>
+        <name>Skagen</name>
         <coordinates>68.583333 15.050000</coordinates>
         <location>
           <name>Storkmarknes Airport</name>
@@ -17436,7 +17436,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Skien</_name>
+        <name>Skien</name>
         <coordinates>59.200000 9.600000</coordinates>
         <location>
           <name>Skien-Geiteryggen</name>
@@ -17446,7 +17446,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Sola</_name>
+        <name>Sola</name>
         <coordinates>58.883333 5.600000</coordinates>
         <location>
           <name>Stavanger Airport</name>
@@ -17456,7 +17456,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Stokka</_name>
+        <name>Stokka</name>
         <coordinates>65.766667 12.566667</coordinates>
         <location>
           <name>Sandnessjoen Airport</name>
@@ -17466,7 +17466,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Svartnes</_name>
+        <name>Svartnes</name>
         <coordinates>70.350000 31.033333</coordinates>
         <location>
           <name>Svartnes</name>
@@ -17476,7 +17476,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Svolvær</_name>
+        <name>Svolvær</name>
         <coordinates>68.233333 14.566667</coordinates>
         <location>
           <name>Svolvær Airport, Helle</name>
@@ -17486,7 +17486,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Sørkjosen</_name>
+        <name>Sørkjosen</name>
         <coordinates>69.800000 20.933333</coordinates>
         <location>
           <name>Sørkjosen</name>
@@ -17496,7 +17496,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Torp</_name>
+        <name>Torp</name>
         <coordinates>59.179722 10.242500</coordinates>
         <location>
           <name>Torp</name>
@@ -17506,7 +17506,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Trondheim</_name>
+        <name>Trondheim</name>
         <coordinates>63.416667 10.416667</coordinates>
         <location>
           <name>Trondheim Airport, Vaernes</name>
@@ -17516,7 +17516,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Vadsø</_name>
+        <name>Vadsø</name>
         <coordinates>70.073056 29.769722</coordinates>
         <location>
           <name>Vadsø</name>
@@ -17526,7 +17526,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Ålesund</_name>
+        <name>Ålesund</name>
         <coordinates>62.466667 6.150000</coordinates>
         <location>
           <name>Ålesund Airport, Vigra</name>
@@ -17536,7 +17536,7 @@
       </city>
       <city>
         <!-- A city in Norway -->
-        <_name>Ørsta</_name>
+        <name>Ørsta</name>
         <coordinates>62.200000 6.150000</coordinates>
         <location>
           <name>Orsta-Volda Airport, Hovden</name>
@@ -17547,7 +17547,7 @@
     </country>
     <country>
       <!-- PL - Poland -->
-      <_name>Poland</_name>
+      <name>Poland</name>
       <iso-code>PL</iso-code>
       <fips-code>PL</fips-code>
       <timezones>
@@ -17556,7 +17556,7 @@
       <tz-hint>Europe/Warsaw</tz-hint>
       <city>
         <!-- A city in Poland -->
-        <_name>Bydgoszcz</_name>
+        <name>Bydgoszcz</name>
         <coordinates>53.123480 18.008438</coordinates>
         <location>
           <name>Bydgoszcz-Szwederowo</name>
@@ -17566,7 +17566,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Gdańsk</_name>
+        <name>Gdańsk</name>
         <coordinates>54.350000 18.666667</coordinates>
         <location>
           <name>Gdańsk-Rębiechowo</name>
@@ -17576,7 +17576,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Katowice</_name>
+        <name>Katowice</name>
         <coordinates>50.266667 19.016667</coordinates>
         <location>
           <name>Katowice-Pyrzowice</name>
@@ -17586,7 +17586,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Kraków</_name>
+        <name>Kraków</name>
         <coordinates>50.083333 19.916667</coordinates>
         <location>
           <name>Kraków-Balice</name>
@@ -17596,7 +17596,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Lublin</_name>
+        <name>Lublin</name>
         <coordinates>51.246452 22.568445</coordinates>
         <location>
           <name>Lublin-Świdnik</name>
@@ -17606,7 +17606,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Łódź</_name>
+        <name>Łódź</name>
         <coordinates>51.750000 19.466667</coordinates>
         <location>
           <name>Łódź-Lublinek</name>
@@ -17616,7 +17616,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Olsztyn</_name>
+        <name>Olsztyn</name>
         <coordinates>53.778422 20.480119</coordinates>
         <location>
           <name>Olsztyn-Szymany</name>
@@ -17626,7 +17626,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Poznań</_name>
+        <name>Poznań</name>
         <coordinates>52.416667 16.966667</coordinates>
         <location>
           <name>Poznań-Ławica</name>
@@ -17636,7 +17636,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Radom</_name>
+        <name>Radom</name>
         <coordinates>51.403611 21.156667</coordinates>
         <location>
           <name>Radom-Sadków</name>
@@ -17646,7 +17646,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Rzeszów</_name>
+        <name>Rzeszów</name>
         <coordinates>50.050000 22.000000</coordinates>
         <location>
           <name>Rzeszów-Jasionka</name>
@@ -17656,7 +17656,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Szczecin</_name>
+        <name>Szczecin</name>
         <coordinates>53.416667 14.583333</coordinates>
         <location>
           <name>Szczecin-Goleniów</name>
@@ -17669,7 +17669,7 @@
              "Warsaw" is the traditional English name.
              The local name in Polish is "Warszawa".
           -->
-        <_name msgctxt="City in Poland">Warsaw</_name>
+        <name msgctxt="City in Poland">Warsaw</name>
         <coordinates>52.250000 21.000000</coordinates>
         <location>
           <name>Warszawa-Okęcie</name>
@@ -17679,7 +17679,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Wrocław</_name>
+        <name>Wrocław</name>
         <coordinates>51.100000 17.033333</coordinates>
         <location>
           <name>Wrocław-Strachowice</name>
@@ -17689,7 +17689,7 @@
       </city>
       <city>
         <!-- A city in Poland -->
-        <_name>Zielona Góra</_name>
+        <name>Zielona Góra</name>
         <coordinates>51.935621 15.506186</coordinates>
         <location>
           <name>Zielona Góra-Babimost</name>
@@ -17700,7 +17700,7 @@
     </country>
     <country>
       <!-- PT - Portugal -->
-      <_name>Portugal</_name>
+      <name>Portugal</name>
       <iso-code>PT</iso-code>
       <fips-code>PO</fips-code>
       <timezones>
@@ -17709,26 +17709,26 @@
                is only used in places where "Portugal" is already
                understood from context.
             -->
-          <_name>Azores</_name>
+          <name>Azores</name>
         </timezone>
         <timezone id="Atlantic/Madeira">
           <!-- This refers to the time zone for the Portuguese island
                of Madeira. The string is only used in places where
                "Portugal" is already understood from context.
             -->
-          <_name>Madeira</_name>
+          <name>Madeira</name>
         </timezone>
         <timezone id="Europe/Lisbon">
           <!-- This refers to the time zone for mainland Portugal (as
                opposed to the time zone for the Azores).
             -->
-          <_name>Mainland Portugal</_name>
+          <name>Mainland Portugal</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Lisbon</tz-hint>
       <city>
         <!-- A city in Portugal -->
-        <_name>Beja</_name>
+        <name>Beja</name>
         <coordinates>38.016667 -7.866667</coordinates>
         <location>
           <name>Beja</name>
@@ -17738,7 +17738,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Castelo Branco</_name>
+        <name>Castelo Branco</name>
         <coordinates>38.516667 -28.733333</coordinates>
         <location>
           <name>Horta / Castelo Branco Acores</name>
@@ -17749,7 +17749,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Faro</_name>
+        <name>Faro</name>
         <coordinates>37.016667 -7.933333</coordinates>
         <location>
           <name>Faro Airport</name>
@@ -17759,7 +17759,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Flor da Rosa</_name>
+        <name>Flor da Rosa</name>
         <coordinates>36.966667 -25.150000</coordinates>
         <location>
           <name>Santa Maria Acores</name>
@@ -17770,7 +17770,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Lajes</_name>
+        <name>Lajes</name>
         <coordinates>38.766667 -27.100000</coordinates>
         <location>
           <name>Lajes Acores</name>
@@ -17784,7 +17784,7 @@
              "Lisbon" is the traditional English name.
              The local name in Portuguese is "Lisboa".
           -->
-        <_name>Lisbon</_name>
+        <name>Lisbon</name>
         <coordinates>38.716667 -9.133333</coordinates>
         <location>
           <name>Lisbon / Portela</name>
@@ -17794,7 +17794,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Monte Real</_name>
+        <name>Monte Real</name>
         <coordinates>39.850000 -8.866667</coordinates>
         <location>
           <name>Monte Real Military Base</name>
@@ -17804,7 +17804,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Montijo</_name>
+        <name>Montijo</name>
         <coordinates>38.700000 -8.966667</coordinates>
         <location>
           <name>Montijo Military Base</name>
@@ -17814,7 +17814,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Ovar</_name>
+        <name>Ovar</name>
         <coordinates>40.866667 -8.633333</coordinates>
         <location>
           <name>Ovar Military Base</name>
@@ -17824,7 +17824,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Ponta Delgada</_name>
+        <name>Ponta Delgada</name>
         <coordinates>37.733333 -25.666667</coordinates>
         <location>
           <name>Ponta Delgada / Nordela Acores</name>
@@ -17835,7 +17835,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Porto</_name>
+        <name>Porto</name>
         <coordinates>41.150000 -8.616667</coordinates>
         <location>
           <name>Porto / Pedras Rubras</name>
@@ -17845,7 +17845,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Porto Santo</_name>
+        <name>Porto Santo</name>
         <coordinates>33.050000 -16.333333</coordinates>
         <location>
           <name>Porto Santo</name>
@@ -17857,7 +17857,7 @@
         <!-- A city in Portugal.
              One of several cities in Portugal called "Santa Cruz".
           -->
-        <_name>Santa Cruz das Flores</_name>
+        <name>Santa Cruz das Flores</name>
         <coordinates>39.450000 -31.116667</coordinates>
         <location>
           <name>Flores Acores</name>
@@ -17868,7 +17868,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Sintra</_name>
+        <name>Sintra</name>
         <coordinates>38.800000 -9.383333</coordinates>
         <location>
           <name>Sintra Military Base</name>
@@ -17878,7 +17878,7 @@
       </city>
       <city>
         <!-- A city in Portugal -->
-        <_name>Água de Pena</_name>
+        <name>Água de Pena</name>
         <coordinates>32.700000 -16.766667</coordinates>
         <location>
           <name>Madeira Airport</name>
@@ -17890,7 +17890,7 @@
     </country>
     <country>
       <!-- RO - Romania -->
-      <_name>Romania</_name>
+      <name>Romania</name>
       <iso-code>RO</iso-code>
       <fips-code>RO</fips-code>
       <timezones>
@@ -17899,7 +17899,7 @@
       <tz-hint>Europe/Bucharest</tz-hint>
       <city>
         <!-- A city in Romania -->
-        <_name>Arad</_name>
+        <name>Arad</name>
         <coordinates>46.183333 21.316667</coordinates>
         <location>
           <name>Arad</name>
@@ -17909,7 +17909,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Bacău</_name>
+        <name>Bacău</name>
         <coordinates>46.566667 26.900000</coordinates>
         <location>
           <name>Bacău</name>
@@ -17919,7 +17919,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Baia Mare</_name>
+        <name>Baia Mare</name>
         <coordinates>47.666667 23.583333</coordinates>
         <location>
           <name>Baia Mare</name>
@@ -17932,7 +17932,7 @@
              "Bucharest" is the traditional English name.
              The local name in Romanian is "Bucureşti".
           -->
-        <_name>Bucharest</_name>
+        <name>Bucharest</name>
         <coordinates>44.433333 26.100000</coordinates>
         <location>
           <name>Bucharest / Imh</name>
@@ -17947,7 +17947,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Cluj-Napoca</_name>
+        <name>Cluj-Napoca</name>
         <coordinates>46.766667 23.600000</coordinates>
         <location>
           <name>Cluj-Napoca</name>
@@ -17957,7 +17957,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Craiova</_name>
+        <name>Craiova</name>
         <coordinates>44.316667 23.800000</coordinates>
         <location>
           <name>Craiova</name>
@@ -17967,7 +17967,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Iaşi</_name>
+        <name>Iaşi</name>
         <coordinates>47.166667 27.600000</coordinates>
         <location>
           <name>Iaşi</name>
@@ -17977,7 +17977,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Mihail Kogălniceanu</_name>
+        <name>Mihail Kogălniceanu</name>
         <coordinates>44.366667 28.450000</coordinates>
         <location>
           <name>Mihail Kogălniceanu</name>
@@ -17987,7 +17987,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Oradea</_name>
+        <name>Oradea</name>
         <coordinates>47.066667 21.933333</coordinates>
         <location>
           <name>Oradea</name>
@@ -17997,7 +17997,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Satu Mare</_name>
+        <name>Satu Mare</name>
         <coordinates>47.800000 22.883333</coordinates>
         <location>
           <name>Satu Mare</name>
@@ -18007,7 +18007,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Sibiu</_name>
+        <name>Sibiu</name>
         <coordinates>45.800000 24.150000</coordinates>
         <location>
           <name>Sibiu</name>
@@ -18017,7 +18017,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Suceava</_name>
+        <name>Suceava</name>
         <coordinates>47.633333 26.250000</coordinates>
         <location>
           <name>Suceava / Salcea</name>
@@ -18027,7 +18027,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Timişoara</_name>
+        <name>Timişoara</name>
         <coordinates>45.749444 21.227222</coordinates>
         <location>
           <name>Timişoara</name>
@@ -18037,7 +18037,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Tulcea</_name>
+        <name>Tulcea</name>
         <coordinates>45.166667 28.800000</coordinates>
         <location>
           <name>Tulcea</name>
@@ -18047,7 +18047,7 @@
       </city>
       <city>
         <!-- A city in Romania -->
-        <_name>Târgu-Mureş</_name>
+        <name>Târgu-Mureş</name>
         <coordinates>46.550000 24.566667</coordinates>
         <location>
           <name>Târgu-Mureş</name>
@@ -18058,7 +18058,7 @@
     </country>
     <country>
       <!-- RU - Russian Federation -->
-      <_name>Russia</_name>
+      <name>Russia</name>
       <!-- Could not find information about the following stations,
            which may be in Russia:
            UESO UHMP UHNN UHSH ULDD ULKK ULOO UMOO UNKL URKM URML USCM
@@ -18078,7 +18078,7 @@
                "Калининградское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Kaliningrad Time</_name>
+          <name>Kaliningrad Time</name>
         </timezone>
         <timezone id="Europe/Moscow">
           <!-- A Russian time zone, used in most of the European part
@@ -18086,7 +18086,7 @@
                "Московское время". This string is only used in places
                where "Russia" is already clear from context.
             -->
-          <_name>Moscow Time</_name>
+          <name>Moscow Time</name>
           <obsoletes>Europe/Volgograd</obsoletes>
         </timezone>
         <timezone id="Europe/Samara">
@@ -18096,7 +18096,7 @@
                used in places where "Russia" is already clear from
                context.
             -->
-          <_name>Samara Time</_name>
+          <name>Samara Time</name>
         </timezone>
         <timezone id="Asia/Yekaterinburg">
           <!-- A Russian time zone, used along the Ural mountains,
@@ -18104,7 +18104,7 @@
                "Екатеринбургское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Yekaterinburg Time</_name>
+          <name>Yekaterinburg Time</name>
         </timezone>
         <timezone id="Asia/Omsk">
           <!-- A Russian time zone, used in the Omsk oblast
@@ -18113,7 +18113,7 @@
                used in places where "Russia" is already clear from
                context.
             -->
-          <_name>Omsk Time</_name>
+          <name>Omsk Time</name>
         </timezone>
         <timezone id="Asia/Novosibirsk">
           <!-- A Russian time zone, used in the Novosibirsk oblast.
@@ -18121,7 +18121,7 @@
                This string is only used in places
                where "Russia" is already clear from context.
             -->
-          <_name>Novosibirsk Time</_name>
+          <name>Novosibirsk Time</name>
         </timezone>
         <timezone id="Asia/Krasnoyarsk">
           <!-- A Russian time zone, used in the Krasnoyarsk krai and
@@ -18129,7 +18129,7 @@
                "Красноярское время". This string is only used in places
                where "Russia" is already clear from context.
             -->
-          <_name>Krasnoyarsk Time</_name>
+          <name>Krasnoyarsk Time</name>
         </timezone>
         <timezone id="Asia/Irkutsk">
           <!-- A Russian time zone, used in the Irkutsk oblast and
@@ -18137,7 +18137,7 @@
                name is "Иркутское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Irkutsk Time</_name>
+          <name>Irkutsk Time</name>
         </timezone>
         <timezone id="Asia/Yakutsk">
           <!-- A Russian time zone, used in the city of Yakutsk and
@@ -18145,7 +18145,7 @@
                name is "Якутское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Yakutsk Time</_name>
+          <name>Yakutsk Time</name>
         </timezone>
         <timezone id="Asia/Vladivostok">
           <!-- A Russian time zone, used in the city of Vladivostok and
@@ -18153,7 +18153,7 @@
                "Владивостокское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Vladivostok Time</_name>
+          <name>Vladivostok Time</name>
           <obsoletes>Asia/Sakhalin</obsoletes>
         </timezone>
         <timezone id="Asia/Magadan">
@@ -18162,7 +18162,7 @@
                "Магаданское время". This string is only used in places
                where "Russia" is already clear from context.
             -->
-          <_name>Magadan Time</_name>
+          <name>Magadan Time</name>
         </timezone>
         <timezone id="Asia/Kamchatka">
           <!-- A Russian time zone, used in the Kamchatka krai and
@@ -18170,7 +18170,7 @@
                is "Камчатское время". This string is only used in
                places where "Russia" is already clear from context.
             -->
-          <_name>Kamchatka Time</_name>
+          <name>Kamchatka Time</name>
           <obsoletes>Asia/Anadyr</obsoletes>
         </timezone>
       </timezones>
@@ -18178,7 +18178,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Абакан".
           -->
-        <_name>Abakan</_name>
+        <name>Abakan</name>
         <coordinates>53.715556 91.429167</coordinates>
         <location>
           <name>Abakan</name>
@@ -18191,7 +18191,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Адлер".
           -->
-        <_name>Adler</_name>
+        <name>Adler</name>
         <coordinates>43.431111 39.923611</coordinates>
         <location>
           <name>Adler</name>
@@ -18204,7 +18204,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Анадырь".
           -->
-        <_name>Anadyr'</_name>
+        <name>Anadyr'</name>
         <coordinates>64.750000 177.483333</coordinates>
         <location>
           <name>Anadyr'</name>
@@ -18217,7 +18217,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Анапа".
           -->
-        <_name>Anapa</_name>
+        <name>Anapa</name>
         <coordinates>44.894444 37.321667</coordinates>
         <location>
           <name>Anapa / Vitiazevo</name>
@@ -18230,7 +18230,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Архангельск".
           -->
-        <_name>Arkhangel'sk</_name>
+        <name>Arkhangel'sk</name>
         <coordinates>64.547222 40.548611</coordinates>
         <location>
           <name>Arhangel'sk</name>
@@ -18243,7 +18243,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Астрахань".
           -->
-        <_name>Astrakhan'</_name>
+        <name>Astrakhan'</name>
         <coordinates>46.349444 48.049167</coordinates>
         <location>
           <name>Astrakhan'</name>
@@ -18256,7 +18256,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Барнаул".
           -->
-        <_name>Barnaul</_name>
+        <name>Barnaul</name>
         <coordinates>53.360556 83.763611</coordinates>
         <location>
           <name>Barnaul</name>
@@ -18269,7 +18269,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Брацк".
           -->
-        <_name>Bratsk</_name>
+        <name>Bratsk</name>
         <coordinates>56.350000 101.916667</coordinates>
         <location>
           <name>Bratsk / Irkutsk</name>
@@ -18282,7 +18282,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Брянск".
           -->
-        <_name>Bryansk</_name>
+        <name>Bryansk</name>
         <coordinates>53.287500 34.380556</coordinates>
         <location>
           <name>Bryansk</name>
@@ -18295,7 +18295,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Челябинск".
           -->
-        <_name>Chelyabinsk</_name>
+        <name>Chelyabinsk</name>
         <coordinates>55.154444 61.429722</coordinates>
         <location>
           <name>Chelyabinsk-Balandino</name>
@@ -18308,7 +18308,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Чита".
           -->
-        <_name>Chita</_name>
+        <name>Chita</name>
         <coordinates>52.031712 113.500867</coordinates>
         <location>
           <name>Chita</name>
@@ -18321,7 +18321,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Чульман".
           -->
-        <_name>Chul'man</_name>
+        <name>Chul'man</name>
         <coordinates>56.846944 124.906111</coordinates>
         <location>
           <name>Cul'man</name>
@@ -18334,7 +18334,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Энгельс".
           -->
-        <_name>Engel's</_name>
+        <name>Engel's</name>
         <coordinates>51.483889 46.105278</coordinates>
         <location>
           <name>Saratov, Tsentralny Airport</name>
@@ -18347,7 +18347,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Иркуцк".
           -->
-        <_name>Irkutsk</_name>
+        <name>Irkutsk</name>
         <coordinates>52.297778 104.296389</coordinates>
         <location>
           <name>Irkutsk</name>
@@ -18360,7 +18360,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Калининград".
           -->
-        <_name>Kaliningrad</_name>
+        <name>Kaliningrad</name>
         <coordinates>54.710000 20.500000</coordinates>
         <location>
           <name>Khrabrovo Airport</name>
@@ -18373,7 +18373,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Казань".
           -->
-        <_name>Kazan'</_name>
+        <name>Kazan'</name>
         <coordinates>55.750000 49.133333</coordinates>
         <location>
           <name>Kazan'</name>
@@ -18386,7 +18386,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Кемерово".
           -->
-        <_name>Kemerovo</_name>
+        <name>Kemerovo</name>
         <coordinates>55.333333 86.083333</coordinates>
         <location>
           <name>Kemerovo</name>
@@ -18399,7 +18399,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Хабаровск".
           -->
-        <_name>Khabarovsk</_name>
+        <name>Khabarovsk</name>
         <coordinates>48.480833 135.092778</coordinates>
         <location>
           <name>Habarovsk</name>
@@ -18412,7 +18412,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Ханты-Мансийск".
           -->
-        <_name>Khanty-Mansiysk</_name>
+        <name>Khanty-Mansiysk</name>
         <coordinates>61.004167 69.001944</coordinates>
         <location>
           <name>Hanty-Mansijsk</name>
@@ -18424,7 +18424,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Краснодар".
           -->
-        <_name>Krasnodar</_name>
+        <name>Krasnodar</name>
         <coordinates>45.032778 38.976944</coordinates>
         <location>
           <name>Krasnodar</name>
@@ -18437,7 +18437,7 @@
 	<!-- A city in Russia.
 	     The local name in Russian is "Красноярск".
 	 -->
-        <_name>Krasnoyarsk</_name>
+        <name>Krasnoyarsk</name>
         <coordinates>56.016667 93.066667</coordinates>
         <location>
           <name>Krasnoyarsk</name>
@@ -18450,7 +18450,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Магадан".
           -->
-        <_name>Magadan</_name>
+        <name>Magadan</name>
         <coordinates>59.566667 150.800000</coordinates>
         <location>
           <name>Magadan</name>
@@ -18463,7 +18463,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Минеральные Воды".
           -->
-        <_name>Mineral'nyye Vody</_name>
+        <name>Mineral'nyye Vody</name>
         <coordinates>44.210278 43.135278</coordinates>
         <location>
           <name>Mineral'nye Vody</name>
@@ -18476,7 +18476,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Мирный".
           -->
-        <_name>Mirnyy</_name>
+        <name>Mirnyy</name>
         <coordinates>62.535278 113.961111</coordinates>
         <location>
           <name>Mirny</name>
@@ -18490,7 +18490,7 @@
              "Moscow" is the traditional English name.
              The local name in Russian is "Moskva / Москва".
           -->
-        <_name msgctxt="City in Russia">Moscow</_name>
+        <name msgctxt="City in Russia">Moscow</name>
         <coordinates>55.752222 37.615556</coordinates>
         <location>
           <name>Vnukovo Airport</name>
@@ -18521,7 +18521,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Мурманск".
           -->
-        <_name>Murmansk</_name>
+        <name>Murmansk</name>
         <coordinates>68.971667 33.081944</coordinates>
         <location>
           <name>Murmansk</name>
@@ -18534,7 +18534,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Нальчик".
           -->
-        <_name>Nal'chik</_name>
+        <name>Nal'chik</name>
         <coordinates>43.498056 43.618889</coordinates>
         <location>
           <name>Nal'chik</name>
@@ -18547,7 +18547,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Нижневартовск".
           -->
-        <_name>Nizhnevartovsk</_name>
+        <name>Nizhnevartovsk</name>
         <coordinates>60.933333 76.566667</coordinates>
         <location>
           <name>Nizhnevartovsk</name>
@@ -18560,7 +18560,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Новокузнецк".
           -->
-        <_name>Novokuznetsk</_name>
+        <name>Novokuznetsk</name>
         <coordinates>53.750000 87.100000</coordinates>
         <location>
           <name>Novokuznetsk</name>
@@ -18573,7 +18573,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Новосибирск".
           -->
-        <_name>Novosibirsk</_name>
+        <name>Novosibirsk</name>
         <coordinates>55.041111 82.934444</coordinates>
         <location>
           <name>Novosibirsk</name>
@@ -18586,7 +18586,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Омск".
           -->
-        <_name>Omsk</_name>
+        <name>Omsk</name>
         <coordinates>55.000000 73.400000</coordinates>
         <location>
           <name>Omsk</name>
@@ -18599,7 +18599,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Оренбург".
           -->
-        <_name>Orenburg</_name>
+        <name>Orenburg</name>
         <coordinates>51.784722 55.098611</coordinates>
         <location>
           <name>Tsentralny Airport</name>
@@ -18612,7 +18612,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Пенза".
           -->
-        <_name>Penza</_name>
+        <name>Penza</name>
         <coordinates>53.195833 45.000000</coordinates>
         <location>
           <name>Penza</name>
@@ -18625,7 +18625,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Пермь".
           -->
-        <_name>Perm'</_name>
+        <name>Perm'</name>
         <coordinates>58.000000 56.250000</coordinates>
         <location>
           <name>Bolshoe Savino Airport</name>
@@ -18638,7 +18638,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Петропавловск-Камчатский".
           -->
-        <_name>Petropavlovsk</_name>
+        <name>Petropavlovsk</name>
         <coordinates>53.016667 158.650000</coordinates>
         <location>
           <name>Petropavlovsk-Kamchatskij</name>
@@ -18651,7 +18651,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Ростов-на-Дону".
           -->
-        <_name>Rostov</_name>
+        <name>Rostov</name>
         <coordinates>47.236389 39.713889</coordinates>
         <location>
           <name>Rostov</name>
@@ -18666,7 +18666,7 @@
              The local name in Russian is "Sankt-Peterburg /
              Санкт-Петербург".
           -->
-        <_name>Saint Petersburg</_name>
+        <name>Saint Petersburg</name>
         <coordinates>59.894444 30.264167</coordinates>
         <location>
           <name>St. Peterburg</name>
@@ -18679,7 +18679,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Самара".
           -->
-        <_name>Samara</_name>
+        <name>Samara</name>
         <coordinates>53.200000 50.150000</coordinates>
         <location>
           <name>Samara</name>
@@ -18690,7 +18690,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Saratov</_name>
+        <name>Saratov</name>
         <coordinates>51.540556 46.008611</coordinates>
         <location>
           <name>Tsentralny Airport</name>
@@ -18703,7 +18703,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Ставрополь".
           -->
-        <_name>Stavropol'</_name>
+        <name>Stavropol'</name>
         <coordinates>45.042778 41.973333</coordinates>
         <location>
           <name>Stavropol' / Mikhaylovsk</name>
@@ -18716,7 +18716,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Стригино".
           -->
-        <_name>Strigino</_name>
+        <name>Strigino</name>
         <coordinates>56.202778 43.798611</coordinates>
         <location>
           <name>Nizhny Novgorod, Strigino Airport</name>
@@ -18729,7 +18729,7 @@
         <!-- A city in Russia.
              The local name in Russian is "Сургут".
           -->
-        <_name>Surgut</_name>
+        <name>Surgut</name>
         <coordinates>61.250000 73.416667</coordinates>
         <location>
           <name>Surgut</name>
@@ -18740,7 +18740,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Syktyvkar</_name>
+        <name>Syktyvkar</name>
         <coordinates>61.666667 50.812222</coordinates>
         <location>
           <name>Syktyvkar</name>
@@ -18751,7 +18751,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Tiksi</_name>
+        <name>Tiksi</name>
         <coordinates>71.687222 128.869444</coordinates>
         <location>
           <name>Tiksi</name>
@@ -18762,7 +18762,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Tyumen</_name>
+        <name>Tyumen</name>
         <coordinates>57.15 65.533333</coordinates>
         <location>
           <name>Tyumen</name>
@@ -18773,7 +18773,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Udachnyy</_name>
+        <name>Udachnyy</name>
         <coordinates>66.416667 112.400000</coordinates>
         <location>
           <name>Polyarny</name>
@@ -18784,7 +18784,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Ufa</_name>
+        <name>Ufa</name>
         <coordinates>54.775000 56.037500</coordinates>
         <location>
           <name>Ufa</name>
@@ -18795,7 +18795,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Ul'yanovsk</_name>
+        <name>Ul'yanovsk</name>
         <coordinates>54.316944 48.366111</coordinates>
         <location>
           <name>Ul'yanovsk</name>
@@ -18805,7 +18805,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Ulan-Ude</_name>
+        <name>Ulan-Ude</name>
         <coordinates>51.826053 107.609794</coordinates>
         <location>
           <name>Ulan-Ude</name>
@@ -18816,7 +18816,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Velikiye Luki</_name>
+        <name>Velikiye Luki</name>
         <coordinates>56.340000 30.534722</coordinates>
         <location>
           <name>Velikiye Luki</name>
@@ -18827,7 +18827,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Vladivostok</_name>
+        <name>Vladivostok</name>
         <coordinates>43.128056 131.901111</coordinates>
         <location>
           <name>Vladivostok</name>
@@ -18838,7 +18838,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Volgograd</_name>
+        <name>Volgograd</name>
         <coordinates>48.804722 44.585833</coordinates>
         <location>
           <name>Volgograd</name>
@@ -18849,7 +18849,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Voronezh</_name>
+        <name>Voronezh</name>
         <coordinates>51.669905 39.192267</coordinates>
         <location>
           <name>Voronez</name>
@@ -18860,7 +18860,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Yakutsk</_name>
+        <name>Yakutsk</name>
         <coordinates>62.033889 129.733056</coordinates>
         <location>
           <name>Jakutsk</name>
@@ -18871,7 +18871,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Yekaterinburg</_name>
+        <name>Yekaterinburg</name>
         <coordinates>56.857500 60.612500</coordinates>
         <location>
           <name>Yekaterinburg</name>
@@ -18882,7 +18882,7 @@
       </city>
       <city>
         <!-- A city in Russia -->
-        <_name>Yuzhno-Sakhalinsk</_name>
+        <name>Yuzhno-Sakhalinsk</name>
         <coordinates>46.958116 142.733665</coordinates>
         <location>
           <name>Yuzhno-Sakhalinsk</name>
@@ -18894,7 +18894,7 @@
     </country>
     <country>
       <!-- SM - San Marino -->
-      <_name msgctxt="Country">San Marino</_name>
+      <name msgctxt="Country">San Marino</name>
       <!-- Could not find information about the following stations,
            which may be in San Marino:
            LIBF LIMA 
@@ -18907,7 +18907,7 @@
       <tz-hint>Europe/San_Marino</tz-hint>
       <city>
         <!-- The capital of San Marino -->
-        <_name msgctxt="City in San Marino">San Marino</_name>
+        <name msgctxt="City in San Marino">San Marino</name>
         <coordinates>43.933333 12.450000</coordinates>
         <location>
           <name>Rimini</name>
@@ -18918,7 +18918,7 @@
     </country>
     <country>
       <!-- RS - Serbia -->
-      <_name>Serbia</_name>
+      <name>Serbia</name>
       <iso-code>RS</iso-code>
       <fips-code>RB</fips-code>
       <timezones>
@@ -18930,7 +18930,7 @@
              "Belgrade" is the traditional English name.
              The local name in Serbian is "Beograd".
           -->
-        <_name>Belgrade</_name>
+        <name>Belgrade</name>
         <coordinates>44.818611 20.468056</coordinates>
         <location>
           <name>Belgrade / Surčin</name>
@@ -18940,7 +18940,7 @@
       </city>
       <city>
         <!-- A city in Serbia -->
-        <_name>Niš</_name>
+        <name>Niš</name>
         <coordinates>43.324722 21.903333</coordinates>
         <location>
           <name>Niš</name>
@@ -18950,7 +18950,7 @@
       </city>
       <city>
         <!-- A city in Serbia -->
-        <_name>Vršac</_name>
+        <name>Vršac</name>
         <coordinates>45.116667 21.303611</coordinates>
         <location>
           <name>Vršac</name>
@@ -18960,7 +18960,7 @@
       </city>
       <city>
         <!-- A city in Serbia -->
-        <_name>Zemun</_name>
+        <name>Zemun</name>
         <coordinates>44.843056 20.401111</coordinates>
         <location>
           <name>Beograd / Surcin</name>
@@ -18971,7 +18971,7 @@
     </country>
     <country>
       <!-- SK - Slovakia -->
-      <_name>Slovakia</_name>
+      <name>Slovakia</name>
       <iso-code>SK</iso-code>
       <fips-code>LO</fips-code>
       <timezones>
@@ -18980,7 +18980,7 @@
       <tz-hint>Europe/Bratislava</tz-hint>
       <city>
         <!-- The capital of Slovakia -->
-        <_name>Bratislava</_name>
+        <name>Bratislava</name>
         <coordinates>48.150000 17.116667</coordinates>
         <location>
           <name>Bratislava Ivanka</name>
@@ -18990,7 +18990,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Dolný Hričov</_name>
+        <name>Dolný Hričov</name>
         <coordinates>49.233333 18.633333</coordinates>
         <location>
           <name>Dolný Hričov</name>
@@ -19000,7 +19000,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Kamenica nad Cirochou</_name>
+        <name>Kamenica nad Cirochou</name>
         <coordinates>48.933333 22.000000</coordinates>
         <location>
           <name>Kamenica nad Cirochou</name>
@@ -19010,7 +19010,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Košice</_name>
+        <name>Košice</name>
         <coordinates>48.716667 21.250000</coordinates>
         <location>
           <name>Košice, Barca</name>
@@ -19020,7 +19020,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Lučenec</_name>
+        <name>Lučenec</name>
         <coordinates>48.333333 19.666667</coordinates>
         <location>
           <name>Lučenec</name>
@@ -19030,7 +19030,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Nitra</_name>
+        <name>Nitra</name>
         <coordinates>48.316667 18.083333</coordinates>
         <location>
           <name>Nitra</name>
@@ -19040,7 +19040,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Piešťany</_name>
+        <name>Piešťany</name>
         <coordinates>48.600000 17.833333</coordinates>
         <location>
           <name>Piešťany</name>
@@ -19050,7 +19050,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Poprad</_name>
+        <name>Poprad</name>
         <coordinates>49.050000 20.300000</coordinates>
         <location>
           <name>Poprad-Tatry Airport</name>
@@ -19060,7 +19060,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Prievidza</_name>
+        <name>Prievidza</name>
         <coordinates>48.766667 18.633333</coordinates>
         <location>
           <name>Prievidza</name>
@@ -19070,7 +19070,7 @@
       </city>
       <city>
         <!-- A city in Slovakia -->
-        <_name>Sliač</_name>
+        <name>Sliač</name>
         <coordinates>48.616667 19.183333</coordinates>
         <location>
           <name>Sliač</name>
@@ -19081,7 +19081,7 @@
     </country>
     <country>
       <!-- SI - Slovenia -->
-      <_name>Slovenia</_name>
+      <name>Slovenia</name>
       <!-- Could not find information about the following stations,
            which may be in Slovenia:
            LJCE 
@@ -19094,7 +19094,7 @@
       <tz-hint>Europe/Ljubljana</tz-hint>
       <city>
         <!-- The capital of Slovenia -->
-        <_name>Ljubljana</_name>
+        <name>Ljubljana</name>
         <coordinates>46.055278 14.514444</coordinates>
         <location>
           <name>Brnik Airport</name>
@@ -19104,7 +19104,7 @@
       </city>
       <city>
         <!-- A city in Slovenia -->
-        <_name>Maribor</_name>
+        <name>Maribor</name>
         <coordinates>46.554722 15.646667</coordinates>
         <location>
           <name>Slivnica Airport</name>
@@ -19114,7 +19114,7 @@
       </city>
       <city>
         <!-- A city in Slovenia -->
-        <_name>Portorož</_name>
+        <name>Portorož</name>
         <coordinates>45.516111 13.588333</coordinates>
         <location>
           <name>Portorož</name>
@@ -19125,7 +19125,7 @@
     </country>
     <country>
       <!-- ES - Spain -->
-      <_name>Spain</_name>
+      <name>Spain</name>
       <!-- Could not find information about the following stations,
            which may be in Spain:
            LEBR 
@@ -19138,26 +19138,26 @@
                string is only used in places where "Spain" is already
                clear from context.
             -->
-          <_name>Canary Islands</_name>
+          <name>Canary Islands</name>
         </timezone>
         <timezone id="Europe/Madrid">
           <!-- This refers to the time zone for mainland Spain (as
                opposed to the time zone for the Canary Islands).
             -->
-          <_name>Mainland Spain</_name>
+          <name>Mainland Spain</name>
         </timezone>
         <timezone id="Africa/Ceuta">
           <!-- The time zone for the Spanish cities of Ceuta and
                Melilla, on the coast of Africa. The string is only used
                in places where "Spain" is already clear from context.
             -->
-          <_name>Ceuta and Melilla</_name>
+          <name>Ceuta and Melilla</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Madrid</tz-hint>
       <city>
         <!-- A city in Spain -->
-        <_name>A Coruña</_name>
+        <name>A Coruña</name>
         <coordinates>43.366667 -8.383333</coordinates>
         <location>
           <name>A Coruña Airport, Alvedro</name>
@@ -19167,7 +19167,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Agoncillo</_name>
+        <name>Agoncillo</name>
         <coordinates>42.450000 -2.283333</coordinates>
         <location>
           <name>Logrono Airport</name>
@@ -19177,7 +19177,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Alcantarilla</_name>
+        <name>Alcantarilla</name>
         <coordinates>37.966667 -1.216667</coordinates>
         <location>
           <name>Murcia Airport</name>
@@ -19187,7 +19187,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Alicante</_name>
+        <name>Alicante</name>
         <coordinates>38.350000 -0.483333</coordinates>
         <location>
           <name>Alicante Airport, El Altet</name>
@@ -19197,7 +19197,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Almería</_name>
+        <name>Almería</name>
         <coordinates>36.833333 -2.450000</coordinates>
         <location>
           <name>Almería Airport</name>
@@ -19207,7 +19207,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Armilla</_name>
+        <name>Armilla</name>
         <coordinates>37.150000 -3.616667</coordinates>
         <location>
           <name>Granada Airport</name>
@@ -19217,7 +19217,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Atogo</_name>
+        <name>Atogo</name>
         <coordinates>28.050000 -16.583333</coordinates>
         <location>
           <name>Tenerife Sur</name>
@@ -19228,7 +19228,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Avilés</_name>
+        <name>Avilés</name>
         <coordinates>43.556944 -5.924722</coordinates>
         <location>
           <name>Asturias Airport</name>
@@ -19238,7 +19238,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Barajas</_name>
+        <name>Barajas</name>
         <coordinates>40.483333 -3.583333</coordinates>
         <location>
           <name>Madrid Airport</name>
@@ -19248,7 +19248,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name msgctxt="City in Spain">Barcelona</_name>
+        <name msgctxt="City in Spain">Barcelona</name>
         <coordinates>41.383333 2.183333</coordinates>
         <location>
           <name>Barcelona Airport</name>
@@ -19258,7 +19258,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Bilbao</_name>
+        <name>Bilbao</name>
         <coordinates>43.250000 -2.966667</coordinates>
         <location>
           <name>Bilbao Airport, Sondica</name>
@@ -19268,7 +19268,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Colmenar Viejo</_name>
+        <name>Colmenar Viejo</name>
         <coordinates>40.666667 -3.766667</coordinates>
         <location>
           <name>Madri-Colmenar</name>
@@ -19278,7 +19278,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Corcovados</_name>
+        <name>Corcovados</name>
         <coordinates>28.616667 -17.750000</coordinates>
         <location>
           <name>La Palma Airport</name>
@@ -19289,7 +19289,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Cuatro Vientos</_name>
+        <name>Cuatro Vientos</name>
         <coordinates>40.383333 -3.783333</coordinates>
         <location>
           <name>Madrid Airport</name>
@@ -19299,7 +19299,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name msgctxt="City in Spain">Córdoba</_name>
+        <name msgctxt="City in Spain">Córdoba</name>
         <coordinates>37.883333 -4.766667</coordinates>
         <location>
           <name>Córdoba Airport</name>
@@ -19309,7 +19309,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>El Matorral</_name>
+        <name>El Matorral</name>
         <coordinates>28.433333 -13.866667</coordinates>
         <location>
           <name>Fuerteventura Airport</name>
@@ -19320,7 +19320,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Fuenterrabía</_name>
+        <name>Fuenterrabía</name>
         <coordinates>43.366667 -1.783333</coordinates>
         <location>
           <name>San Sebastian Airport</name>
@@ -19330,7 +19330,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Gando</_name>
+        <name>Gando</name>
         <coordinates>27.950000 -15.366667</coordinates>
         <location>
           <name>Gran Canaria - Canary Islands</name>
@@ -19341,7 +19341,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Gerona</_name>
+        <name>Gerona</name>
         <coordinates>41.983333 2.816667</coordinates>
         <location>
           <name>Gerona Airport, Costa Brava</name>
@@ -19351,7 +19351,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Getafe</_name>
+        <name>Getafe</name>
         <coordinates>40.300000 -3.716667</coordinates>
         <location>
           <name>Madrid Airport</name>
@@ -19361,7 +19361,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Granada</_name>
+        <name>Granada</name>
         <coordinates>37.183333 -3.600000</coordinates>
         <location>
           <name>Granada Airport</name>
@@ -19371,7 +19371,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Güime</_name>
+        <name>Güime</name>
         <coordinates>28.966667 -13.600000</coordinates>
         <location>
           <name>Lanzarote Airport</name>
@@ -19382,7 +19382,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Ibiza</_name>
+        <name>Ibiza</name>
         <coordinates>38.900000 1.433333</coordinates>
         <location>
           <name>Ibiza Airport, Es Codola</name>
@@ -19392,7 +19392,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Jerez</_name>
+        <name>Jerez</name>
         <coordinates>36.683333 -6.133333</coordinates>
         <location>
           <name>Jerez Airport</name>
@@ -19402,7 +19402,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name msgctxt="City in Spain">León</_name>
+        <name msgctxt="City in Spain">León</name>
         <coordinates>42.600000 -5.566667</coordinates>
         <location>
           <name>León Airport, Virgen del Camino</name>
@@ -19412,7 +19412,7 @@
       </city>
       <city>
 	<!-- A city in Spain -->
-        <_name>Lleida</_name>
+        <name>Lleida</name>
         <coordinates>41.727778 0.535833</coordinates>
         <location>
 	  <name>Lleida–Alguaire Airport</name>
@@ -19422,7 +19422,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Los Baldíos</_name>
+        <name>Los Baldíos</name>
         <coordinates>28.466667 -16.316667</coordinates>
         <location>
           <name>Tenerife / Los Rodeos</name>
@@ -19433,7 +19433,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Los Llanos</_name>
+        <name>Los Llanos</name>
         <coordinates>38.916667 -1.850000</coordinates>
         <location>
           <name>Albacete Airport</name>
@@ -19443,7 +19443,7 @@
       </city>
       <city>
         <!-- The capital of Spain -->
-        <_name>Madrid</_name>
+        <name>Madrid</name>
         <coordinates>40.400000 -3.683333</coordinates>
         <location>
           <name>Madrid Airport, Cuatro Vientos</name>
@@ -19453,7 +19453,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Mahón</_name>
+        <name>Mahón</name>
         <coordinates>39.883333 4.250000</coordinates>
         <location>
           <name>Menorca Airport</name>
@@ -19463,7 +19463,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Melilla</_name>
+        <name>Melilla</name>
         <coordinates>35.316667 -2.950000</coordinates>
         <location>
           <name>Melilla</name>
@@ -19473,7 +19473,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Morón</_name>
+        <name>Morón</name>
         <coordinates>37.133333 -5.450000</coordinates>
         <location>
           <name>Morón</name>
@@ -19483,7 +19483,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Málaga</_name>
+        <name>Málaga</name>
         <coordinates>36.716667 -4.416667</coordinates>
         <location>
           <name>Málaga Airport</name>
@@ -19493,7 +19493,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Noáin</_name>
+        <name>Noáin</name>
         <coordinates>42.750000 -1.633333</coordinates>
         <location>
           <name>Pamplona Airport</name>
@@ -19503,7 +19503,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Palma</_name>
+        <name>Palma</name>
         <coordinates>39.566667 2.650000</coordinates>
         <location>
           <name>Palma Airport, Son San Juan</name>
@@ -19513,7 +19513,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Reus</_name>
+        <name>Reus</name>
         <coordinates>41.150000 1.116667</coordinates>
         <location>
           <name>Reus Airport</name>
@@ -19523,7 +19523,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Rota</_name>
+        <name>Rota</name>
         <coordinates>36.616667 -6.350000</coordinates>
         <location>
           <name>Rota</name>
@@ -19533,7 +19533,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Sabadell</_name>
+        <name>Sabadell</name>
         <coordinates>41.550000 2.100000</coordinates>
         <location>
           <name>Sabadell</name>
@@ -19543,7 +19543,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Salamanca</_name>
+        <name>Salamanca</name>
         <coordinates>40.966667 -5.650000</coordinates>
         <location>
           <name>Salamanca Airport, Matacan</name>
@@ -19553,7 +19553,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>San Javier</_name>
+        <name>San Javier</name>
         <coordinates>37.800000 -0.850000</coordinates>
         <location>
           <name>Murcia Airport</name>
@@ -19563,7 +19563,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>San Pablo</_name>
+        <name>San Pablo</name>
         <coordinates>37.416667 -5.883333</coordinates>
         <location>
           <name>Sevilla Airport</name>
@@ -19573,7 +19573,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Santander</_name>
+        <name>Santander</name>
         <coordinates>43.464722 -3.804444</coordinates>
         <location>
           <name>Santander Airport, Parayas</name>
@@ -19583,7 +19583,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name msgctxt="City in Spain">Santiago</_name>
+        <name msgctxt="City in Spain">Santiago</name>
         <coordinates>42.883333 -8.550000</coordinates>
         <location>
           <name>Santiago Airport, Labacolla</name>
@@ -19593,7 +19593,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Talavera la Real</_name>
+        <name>Talavera la Real</name>
         <coordinates>38.883333 -6.766667</coordinates>
         <location>
           <name>Badajoz Airport</name>
@@ -19603,7 +19603,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Tamaduste</_name>
+        <name>Tamaduste</name>
         <coordinates>27.816667 -17.883333</coordinates>
         <location>
           <name>Hierro Airport</name>
@@ -19614,7 +19614,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Torrejón del Rey</_name>
+        <name>Torrejón del Rey</name>
         <coordinates>40.650000 -3.333333</coordinates>
         <location>
           <name>Madrid Airport</name>
@@ -19624,7 +19624,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name msgctxt="City in Spain">Valencia</_name>
+        <name msgctxt="City in Spain">Valencia</name>
         <coordinates>39.466667 -0.366667</coordinates>
         <location>
           <name>Valencia Airport</name>
@@ -19634,7 +19634,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Vigo</_name>
+        <name>Vigo</name>
         <coordinates>42.233333 -8.716667</coordinates>
         <location>
           <name>Vigo Airport, Peinador</name>
@@ -19644,7 +19644,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Villanubla</_name>
+        <name>Villanubla</name>
         <coordinates>41.700000 -4.833333</coordinates>
         <location>
           <name>Valladolid Airport</name>
@@ -19654,7 +19654,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Vitoria-Gasteiz</_name>
+        <name>Vitoria-Gasteiz</name>
         <coordinates>42.850000 -2.666667</coordinates>
         <location>
           <name>Vitoria-Gasteiz</name>
@@ -19664,7 +19664,7 @@
       </city>
       <city>
         <!-- A city in Spain -->
-        <_name>Zaragoza</_name>
+        <name>Zaragoza</name>
         <coordinates>41.633333 -0.883333</coordinates>
         <location>
           <name>Zaragoza Airport</name>
@@ -19678,7 +19678,7 @@
            Arctic Ocean which is a part of Norway with unusual status
            internationally.
         -->
-      <_name>Svalbard and Jan Mayen</_name>
+      <name>Svalbard and Jan Mayen</name>
       <!-- Could not find information about the following stations,
            which may be in Svalbard and Jan Mayen:
            ENDR ENEK ENGC ENHE ENSL 
@@ -19691,7 +19691,7 @@
       <tz-hint>Arctic/Longyearbyen</tz-hint>
       <city>
         <!-- The capital of Svalbard and Jan Mayen -->
-        <_name>Longyearbyen</_name>
+        <name>Longyearbyen</name>
         <coordinates>78.216667 15.633333</coordinates>
         <location>
           <name>Svalbard Airport</name>
@@ -19702,7 +19702,7 @@
     </country>
     <country>
       <!-- SE - Sweden -->
-      <_name>Sweden</_name>
+      <name>Sweden</name>
       <!-- Could not find information about the following stations,
            which may be in Sweden:
            ESGL ESNZ ESUD ESUT 
@@ -19715,7 +19715,7 @@
       <tz-hint>Europe/Stockholm</tz-hint>
       <city>
         <!-- A city in Sweden -->
-        <_name>Borlänge</_name>
+        <name>Borlänge</name>
         <coordinates>60.483333 15.416667</coordinates>
         <location>
           <name>Borlänge</name>
@@ -19725,7 +19725,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Gällivare</_name>
+        <name>Gällivare</name>
         <coordinates>67.133333 20.700000</coordinates>
         <location>
           <name>Gällivare</name>
@@ -19735,7 +19735,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Göteborg</_name>
+        <name>Göteborg</name>
         <coordinates>57.716667 11.966667</coordinates>
         <location>
           <name>Göteborg-Save Airport</name>
@@ -19750,7 +19750,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Halmstad</_name>
+        <name>Halmstad</name>
         <coordinates>56.671389 12.855556</coordinates>
         <location>
           <name>Halmstad Swedish Air Force Base</name>
@@ -19760,7 +19760,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Jönköping</_name>
+        <name>Jönköping</name>
         <coordinates>57.783333 14.183333</coordinates>
         <location>
           <name>Jönköping Airport</name>
@@ -19770,7 +19770,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Kalmar</_name>
+        <name>Kalmar</name>
         <coordinates>56.666667 16.366667</coordinates>
         <location>
           <name>Kalmar</name>
@@ -19780,7 +19780,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Karlstad</_name>
+        <name>Karlstad</name>
         <coordinates>59.366667 13.500000</coordinates>
         <location>
           <name>Karlstad</name>
@@ -19790,7 +19790,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Kiruna</_name>
+        <name>Kiruna</name>
         <coordinates>67.850000 20.216667</coordinates>
         <location>
           <name>Kiruna Airport</name>
@@ -19800,7 +19800,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Kramfors</_name>
+        <name>Kramfors</name>
         <coordinates>62.933333 17.792500</coordinates>
         <location>
           <name>Kramfors Airport</name>
@@ -19810,7 +19810,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Kristianstad</_name>
+        <name>Kristianstad</name>
         <coordinates>56.033333 14.133333</coordinates>
         <location>
           <name>Kristianstad-Everod Airport</name>
@@ -19820,7 +19820,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Linköping</_name>
+        <name>Linköping</name>
         <coordinates>58.416667 15.616667</coordinates>
         <location>
           <name>Linköping-Saab Airport</name>
@@ -19830,7 +19830,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Ljungbyhed</_name>
+        <name>Ljungbyhed</name>
         <coordinates>56.066667 13.216667</coordinates>
         <location>
           <name>Ljungbyhed</name>
@@ -19840,7 +19840,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Luleå</_name>
+        <name>Luleå</name>
         <coordinates>65.583333 22.150000</coordinates>
         <location>
           <name>Luleå-Kallax Airport</name>
@@ -19850,7 +19850,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Lycksele</_name>
+        <name>Lycksele</name>
         <coordinates>64.600000 18.666667</coordinates>
         <location>
           <name>Lycksele</name>
@@ -19860,7 +19860,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Malmö</_name>
+        <name>Malmö</name>
         <coordinates>55.600000 13.000000</coordinates>
         <location>
           <name>Malmö-Sturup Airport</name>
@@ -19870,7 +19870,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Norrköping</_name>
+        <name>Norrköping</name>
         <coordinates>58.600000 16.183333</coordinates>
         <location>
           <name>Norrköping</name>
@@ -19880,7 +19880,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Nyköping</_name>
+        <name>Nyköping</name>
         <coordinates>58.750000 17.000000</coordinates>
         <location>
           <name>Stockholm, Stockholm-Skavsta Airport</name>
@@ -19890,7 +19890,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Ronneby</_name>
+        <name>Ronneby</name>
         <coordinates>56.200000 15.300000</coordinates>
         <location>
           <name>Ronneby</name>
@@ -19900,7 +19900,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Skellefteå</_name>
+        <name>Skellefteå</name>
         <coordinates>64.766667 20.950000</coordinates>
         <location>
           <name>Skellefteå Airport</name>
@@ -19910,7 +19910,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Skövde</_name>
+        <name>Skövde</name>
         <coordinates>58.400000 13.850000</coordinates>
         <location>
           <name>Skövde Airport</name>
@@ -19920,7 +19920,7 @@
       </city>
       <city>
         <!-- The capital of Sweden -->
-        <_name>Stockholm</_name>
+        <name>Stockholm</name>
         <coordinates>59.333333 18.050000</coordinates>
         <location>
           <name>Stockholm-Bromma Airport</name>
@@ -19935,7 +19935,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Sundsvall</_name>
+        <name>Sundsvall</name>
         <coordinates>62.383333 17.300000</coordinates>
         <location>
           <name>Sundsvall-Harnosand Airport</name>
@@ -19945,7 +19945,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Söderhamn</_name>
+        <name>Söderhamn</name>
         <coordinates>61.300000 17.050000</coordinates>
         <location>
           <name>Söderhamn</name>
@@ -19955,7 +19955,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Umeå</_name>
+        <name>Umeå</name>
         <coordinates>63.833333 20.250000</coordinates>
         <location>
           <name>Umeå Airport</name>
@@ -19965,7 +19965,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Visby</_name>
+        <name>Visby</name>
         <coordinates>57.633333 18.300000</coordinates>
         <location>
           <name>Visby Airport</name>
@@ -19975,7 +19975,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Västerås</_name>
+        <name>Västerås</name>
         <coordinates>59.616667 16.550000</coordinates>
         <location>
           <name>Västerås-Hasslo Airport</name>
@@ -19985,7 +19985,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Växjö</_name>
+        <name>Växjö</name>
         <coordinates>56.883333 14.816667</coordinates>
         <location>
           <name>Växjö</name>
@@ -19995,7 +19995,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Ängelholm</_name>
+        <name>Ängelholm</name>
         <coordinates>56.250000 12.866667</coordinates>
         <location>
           <name>Ängelholm</name>
@@ -20005,7 +20005,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Örebro</_name>
+        <name>Örebro</name>
         <coordinates>59.283333 15.216667</coordinates>
         <location>
           <name>Orebro Private</name>
@@ -20015,7 +20015,7 @@
       </city>
       <city>
         <!-- A city in Sweden -->
-        <_name>Örnsköldsvik</_name>
+        <name>Örnsköldsvik</name>
         <coordinates>63.300000 18.716667</coordinates>
         <location>
           <name>Örnsköldsvik Airport</name>
@@ -20026,7 +20026,7 @@
     </country>
     <country>
       <!-- CH - Switzerland -->
-      <_name>Switzerland</_name>
+      <name>Switzerland</name>
       <iso-code>CH</iso-code>
       <fips-code>SZ</fips-code>
       <timezones>
@@ -20035,7 +20035,7 @@
       <tz-hint>Europe/Zurich</tz-hint>
       <city>
         <!-- The capital of Switzerland -->
-        <_name>Bern</_name>
+        <name>Bern</name>
         <coordinates>46.916667 7.466667</coordinates>
         <location>
           <name>Bern-Belp Airport</name>
@@ -20045,7 +20045,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Basel</_name>
+        <name>Basel</name>
         <coordinates>47.583333 7.516667</coordinates>
         <location>
           <name>Bale-Mulhouse</name>
@@ -20058,7 +20058,7 @@
              "Geneva" is the traditional English name.
              The local name is "Genève".
           -->
-        <_name>Geneva</_name>
+        <name>Geneva</name>
         <coordinates>46.200000 6.166667</coordinates>
         <location>
           <name>Geneve-Cointrin</name>
@@ -20068,7 +20068,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Grenchen</_name>
+        <name>Grenchen</name>
         <coordinates>47.183333 7.383333</coordinates>
         <location>
           <name>Grenchen</name>
@@ -20078,7 +20078,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Lugano</_name>
+        <name>Lugano</name>
         <coordinates>46.000000 8.966667</coordinates>
         <location>
           <name>Lugano</name>
@@ -20088,7 +20088,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Neuchâtel</_name>
+        <name>Neuchâtel</name>
         <coordinates>47.000000 6.966667</coordinates>
         <location>
           <name>Les Eplatures</name>
@@ -20098,7 +20098,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Sankt Gallen</_name>
+        <name>Sankt Gallen</name>
         <coordinates>47.466667 9.400000</coordinates>
         <location>
           <name>Saint Gallen-Altenrhein</name>
@@ -20108,7 +20108,7 @@
       </city>
       <city>
 	<!-- A city in Switzerland -->
-	<_name>St. Moritz</_name>
+	<name>St. Moritz</name>
         <coordinates>46.5 9.833333</coordinates>
         <location>
           <name>Samedan</name>
@@ -20118,7 +20118,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Sion</_name>
+        <name>Sion</name>
         <coordinates>46.233333 7.350000</coordinates>
         <location>
           <name>Sion</name>
@@ -20128,7 +20128,7 @@
       </city>
       <city>
         <!-- A city in Switzerland -->
-        <_name>Zürich</_name>
+        <name>Zürich</name>
         <coordinates>47.366667 8.550000</coordinates>
         <location>
           <name>Zurich-Kloten</name>
@@ -20139,7 +20139,7 @@
     </country>
     <country>
       <!-- TR - Turkey -->
-      <_name>Turkey</_name>
+      <name>Turkey</name>
       <!-- Could not find weather stations for the following major
            cities:
            Batman, Kiziltepe
@@ -20152,7 +20152,7 @@
       <tz-hint>Europe/Istanbul</tz-hint>
       <city>
         <!-- A city in Turkey -->
-        <_name>Adana</_name>
+        <name>Adana</name>
         <coordinates>37.001667 35.328889</coordinates>
         <location>
           <name>Adana-Sakirpasa Airport</name>
@@ -20167,7 +20167,7 @@
       </city>
       <city>
         <!-- The capital of Turkey -->
-        <_name>Ankara</_name>
+        <name>Ankara</name>
         <coordinates>40.116667 32.983333</coordinates>
         <location>
           <name>Ankara-Guvercin Lik Airport</name>
@@ -20187,7 +20187,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Antalya</_name>
+        <name>Antalya</name>
         <coordinates>36.912500 30.689722</coordinates>
         <location>
           <name>Antalya</name>
@@ -20197,7 +20197,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Balikesir</_name>
+        <name>Balikesir</name>
         <coordinates>39.649167 27.886111</coordinates>
         <location>
           <name>Balikesir</name>
@@ -20207,7 +20207,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Bandirma</_name>
+        <name>Bandirma</name>
         <coordinates>40.352222 27.976667</coordinates>
         <location>
           <name>Bandirma</name>
@@ -20217,7 +20217,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Bodrum</_name>
+        <name>Bodrum</name>
         <coordinates>37.038333 27.429167</coordinates>
         <location>
           <name>Bodrum Milas Airport</name>
@@ -20227,7 +20227,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Burdur</_name>
+        <name>Burdur</name>
         <coordinates>37.720278 30.290833</coordinates>
         <location>
           <name>Suleyman Demirel</name>
@@ -20237,7 +20237,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Bursa</_name>
+        <name>Bursa</name>
         <coordinates>40.191667 29.061111</coordinates>
         <location>
           <name>Bursa-Yenisehir, Mil-Civ Airport</name>
@@ -20247,7 +20247,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Corlu</_name>
+        <name>Corlu</name>
         <coordinates>41.159167 27.800000</coordinates>
         <location>
           <name>Corlu</name>
@@ -20257,7 +20257,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Dalaman</_name>
+        <name>Dalaman</name>
         <coordinates>36.765000 28.804167</coordinates>
         <location>
           <name>Dalaman</name>
@@ -20267,7 +20267,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Diyarbakir</_name>
+        <name>Diyarbakir</name>
         <coordinates>37.915833 40.218889</coordinates>
         <location>
           <name>Diyarbakir</name>
@@ -20277,7 +20277,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Erzurum</_name>
+        <name>Erzurum</name>
         <coordinates>39.908611 41.276944</coordinates>
         <location>
           <name>Erzurum</name>
@@ -20287,7 +20287,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Eskisehir</_name>
+        <name>Eskisehir</name>
         <coordinates>39.776667 30.520556</coordinates>
         <location>
           <name>Eskisehir</name>
@@ -20297,7 +20297,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Gaziantep</_name>
+        <name>Gaziantep</name>
         <coordinates>37.059444 37.382500</coordinates>
         <location>
           <name>Gaziantep</name>
@@ -20307,7 +20307,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Istanbul</_name>
+        <name>Istanbul</name>
         <coordinates>41.018611 28.964722</coordinates>
         <location>
           <name>Istanbul-Ataturk Airport</name>
@@ -20322,7 +20322,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Izmir</_name>
+        <name>Izmir</name>
         <coordinates>38.410375 27.142010</coordinates>
         <location>
           <name>Izmir-Cigli Airport</name>
@@ -20337,7 +20337,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Kars</_name>
+        <name>Kars</name>
         <coordinates>40.608056 43.097500</coordinates>
         <location>
           <name>Kars</name>
@@ -20347,7 +20347,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Kayseri</_name>
+        <name>Kayseri</name>
         <coordinates>38.732222 35.485278</coordinates>
         <location>
           <name>Kayseri-Erkilet Airport</name>
@@ -20357,7 +20357,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Kislakoy</_name>
+        <name>Kislakoy</name>
         <coordinates>40.099082 32.602115</coordinates>
         <location>
           <name>Murted Air Force Base</name>
@@ -20367,7 +20367,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Konya</_name>
+        <name>Konya</name>
         <coordinates>37.865556 32.482500</coordinates>
         <location>
           <name>Konya</name>
@@ -20377,7 +20377,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Malatya</_name>
+        <name>Malatya</name>
         <coordinates>38.353333 38.311944</coordinates>
         <location>
           <name>Malatya-Erhac Airport</name>
@@ -20387,7 +20387,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Merzifon</_name>
+        <name>Merzifon</name>
         <coordinates>40.873333 35.463056</coordinates>
         <location>
           <name>Merzifon</name>
@@ -20397,7 +20397,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Nevsehir</_name>
+        <name>Nevsehir</name>
         <coordinates>38.625000 34.712222</coordinates>
         <location>
           <name>Nevsehir</name>
@@ -20407,7 +20407,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Samsun</_name>
+        <name>Samsun</name>
         <coordinates>41.286667 36.330000</coordinates>
         <location>
           <name>Samsun-Carsamba Airport</name>
@@ -20417,7 +20417,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Tepetarla</_name>
+        <name>Tepetarla</name>
         <coordinates>40.750000 30.066667</coordinates>
         <location>
           <name>Topel Air Force Base</name>
@@ -20427,7 +20427,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Trabzon</_name>
+        <name>Trabzon</name>
         <coordinates>41.005000 39.726944</coordinates>
         <location>
           <name>Trabzon</name>
@@ -20437,7 +20437,7 @@
       </city>
       <city>
         <!-- A city in Turkey -->
-        <_name>Van</_name>
+        <name>Van</name>
         <coordinates>38.494167 43.380000</coordinates>
         <location>
           <name>Van</name>
@@ -20448,7 +20448,7 @@
     </country>
     <country>
       <!-- UA - Ukraine -->
-      <_name>Ukraine</_name>
+      <name>Ukraine</name>
       <!-- Could not find information about the following stations,
            which may be in Ukraine:
            UKCM UKCW 
@@ -20465,7 +20465,7 @@
       <tz-hint>Europe/Kiev</tz-hint>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Boryspil'</_name>
+        <name>Boryspil'</name>
         <coordinates>50.350000 30.950000</coordinates>
         <location>
           <name>Boryspil'</name>
@@ -20475,7 +20475,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Chagor</_name>
+        <name>Chagor</name>
         <coordinates>48.250000 25.983333</coordinates>
         <location>
           <name>Chernovsty</name>
@@ -20485,7 +20485,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Dnipropetrovs'k</_name>
+        <name>Dnipropetrovs'k</name>
         <coordinates>48.450000 34.983333</coordinates>
         <location>
           <name>Dnipropetrovs'k</name>
@@ -20495,7 +20495,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Donets'k</_name>
+        <name>Donets'k</name>
         <coordinates>48.000000 37.800000</coordinates>
         <location>
           <name>Donets'k</name>
@@ -20505,7 +20505,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Hostomel'</_name>
+        <name>Hostomel'</name>
         <coordinates>50.583333 30.266667</coordinates>
         <location>
           <name>Hostomel'</name>
@@ -20515,7 +20515,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Ivano-Frankivs'k</_name>
+        <name>Ivano-Frankivs'k</name>
         <coordinates>48.917222 24.707222</coordinates>
         <location>
           <name>Ivano-Frankivs'k</name>
@@ -20525,7 +20525,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Kharkiv</_name>
+        <name>Kharkiv</name>
         <coordinates>50.000000 36.250000</coordinates>
         <location>
           <name>Kharkiv</name>
@@ -20538,7 +20538,7 @@
              "Kiev" is the traditional English name.
              The local name in Ukrainian is "Kyyiv".
           -->
-        <_name>Kiev</_name>
+        <name>Kiev</name>
         <coordinates>50.433333 30.516667</coordinates>
         <location>
           <name>Kyiv</name>
@@ -20548,7 +20548,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Kryvyy Rih</_name>
+        <name>Kryvyy Rih</name>
         <coordinates>47.916667 33.350000</coordinates>
         <location>
           <name>Kryvyy Rih / Dnipropetrovs'k</name>
@@ -20558,7 +20558,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>L'viv</_name>
+        <name>L'viv</name>
         <coordinates>49.833333 24.000000</coordinates>
         <location>
           <name>L'viv</name>
@@ -20568,7 +20568,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Mokroye</_name>
+        <name>Mokroye</name>
         <coordinates>47.816667 35.250000</coordinates>
         <location>
           <name>Zaporizhzhia / Mokroye</name>
@@ -20578,7 +20578,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Mykolayiv</_name>
+        <name>Mykolayiv</name>
         <coordinates>46.966667 32.000000</coordinates>
         <location>
           <name>Mykolaiv</name>
@@ -20588,7 +20588,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Odesa</_name>
+        <name>Odesa</name>
         <coordinates>46.466667 30.733333</coordinates>
         <location>
           <name>Odesa</name>
@@ -20598,7 +20598,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Rivne</_name>
+        <name>Rivne</name>
         <coordinates>50.616667 26.250000</coordinates>
         <location>
           <name>Rivne</name>
@@ -20608,7 +20608,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Simferopol'</_name>
+        <name>Simferopol'</name>
         <coordinates>44.950000 34.100000</coordinates>
         <location>
           <name>Simferopol'</name>
@@ -20618,7 +20618,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Telichka</_name>
+        <name>Telichka</name>
         <coordinates>50.400000 30.566667</coordinates>
         <location>
           <name>Kyiv</name>
@@ -20628,7 +20628,7 @@
       </city>
       <city>
         <!-- A city in Ukraine -->
-        <_name>Uzhhorod</_name>
+        <name>Uzhhorod</name>
         <coordinates>48.616667 22.300000</coordinates>
         <location>
           <name>Uzhhorod</name>
@@ -20639,7 +20639,7 @@
     </country>
     <country>
       <!-- GB - United Kingdom -->
-      <_name>United Kingdom</_name>
+      <name>United Kingdom</name>
       <iso-code>GB</iso-code>
       <fips-code>UK</fips-code>
       <timezones>
@@ -20647,13 +20647,13 @@
           <!-- The time zone in the UK (GMT in the winter, and British
                Summer Time in the summer.)
             -->
-          <_name>GMT/BST</_name>
+          <name>GMT/BST</name>
         </timezone>
       </timezones>
       <tz-hint>Europe/London</tz-hint>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>East and South East England</_name>
+        <name>East and South East England</name>
         <fips-code>UKA5|UKC3|UKE4|UKF8|UKI1|UKI5|UKI9|UKK3|UKM5|UKN5|UKO3</fips-code>
         <fips-code>UKB3|UKB6|UKB9|UKE2|UKF2|UKG2|UKG5|UKI3|UKI6|UKK2|UKK6|UKK7|UKM1|UKM4|UKP4|UKP6|UKP9|UKQ2</fips-code>
         <fips-code>UKA1|UKA2|UKA6|UKB5|UKB8|UKC4|UKC8|UKD9|UKE3|UKE7|UKE8|UKF1|UKF3|UKF4|UKF6|UKF9|UKG1|UKG3|UKG4|UKG7|UKH1|UKH6|UKH9|UKI4|UKI8|UKK8|UKL1|UKM8|UKN8|UKO5|UKO9|UKP1|UKP5</fips-code>
@@ -20661,7 +20661,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name msgctxt="City in East and South East England, United Kingdom">Benson</_name>
+          <name msgctxt="City in East and South East England, United Kingdom">Benson</name>
           <coordinates>51.633333 -1.116667</coordinates>
           <location>
             <name>Benson</name>
@@ -20674,7 +20674,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Biggin Hill</_name>
+          <name>Biggin Hill</name>
           <coordinates>51.283333 0.033333</coordinates>
           <location>
             <name>Biggin Hill</name>
@@ -20687,7 +20687,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Brize Norton</_name>
+          <name>Brize Norton</name>
           <coordinates>51.766667 -1.566667</coordinates>
           <location>
             <name>Brize Norton</name>
@@ -20700,7 +20700,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name msgctxt="City in East and South East England, United Kingdom">Cambridge</_name>
+          <name msgctxt="City in East and South East England, United Kingdom">Cambridge</name>
           <coordinates>52.200000 0.116667</coordinates>
           <location>
             <name>Cambridge</name>
@@ -20713,7 +20713,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Farnborough</_name>
+          <name>Farnborough</name>
           <coordinates>51.266667 -0.733333</coordinates>
           <location>
             <name>Farnborough</name>
@@ -20725,7 +20725,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Lakenheath</_name>
+          <name>Lakenheath</name>
           <coordinates>52.433333 0.566667</coordinates>
           <location>
             <name>Lakenheath Royal Air Force Base</name>
@@ -20735,7 +20735,7 @@
         </city>
         <city>
           <!-- The capital of the United Kingdom -->
-          <_name msgctxt="City in East and South East England, United Kingdom">London</_name>
+          <name msgctxt="City in East and South East England, United Kingdom">London</name>
           <coordinates>51.500000 -0.116667</coordinates>
           <location>
             <name>Heathrow Airport</name>
@@ -20760,7 +20760,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Luton</_name>
+          <name>Luton</name>
           <coordinates>51.883333 -0.416667</coordinates>
           <location>
             <name>Luton Airport</name>
@@ -20773,7 +20773,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Lydd</_name>
+          <name>Lydd</name>
           <coordinates>50.950000 0.916667</coordinates>
           <location>
             <name>Lydd Airport</name>
@@ -20785,7 +20785,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Manston</_name>
+          <name>Manston</name>
           <coordinates>51.350000 1.366667</coordinates>
           <location>
             <name>Manston, South East</name>
@@ -20797,7 +20797,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Marham</_name>
+          <name>Marham</name>
           <coordinates>52.650000 0.550000</coordinates>
           <location>
             <name>Marham</name>
@@ -20809,7 +20809,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Mildenhall</_name>
+          <name>Mildenhall</name>
           <coordinates>52.350000 0.516667</coordinates>
           <location>
             <name>Mildenhall Royal Air Force Base</name>
@@ -20821,7 +20821,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Northolt</_name>
+          <name>Northolt</name>
           <coordinates>51.533333 -0.366667</coordinates>
           <location>
             <name>Northolt</name>
@@ -20833,7 +20833,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Norwich</_name>
+          <name>Norwich</name>
           <coordinates>52.633333 1.300000</coordinates>
           <location>
             <name>Norwich Weather Centre</name>
@@ -20846,7 +20846,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Odiham</_name>
+          <name>Odiham</name>
           <coordinates>51.250000 -0.933333</coordinates>
           <location>
             <name>Odiham</name>
@@ -20858,7 +20858,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Shoreham-by-Sea</_name>
+          <name>Shoreham-by-Sea</name>
           <coordinates>50.833333 -0.233333</coordinates>
           <location>
             <name>Shoreham-by-Sea Airport</name>
@@ -20871,7 +20871,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Southampton</_name>
+          <name>Southampton</name>
           <coordinates>50.900000 -1.400000</coordinates>
           <location>
             <name>Southampton / Weather Centre</name>
@@ -20884,7 +20884,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name msgctxt="City in East and South East England, United Kingdom">Southend</_name>
+          <name msgctxt="City in East and South East England, United Kingdom">Southend</name>
           <coordinates>51.533333 0.700000</coordinates>
           <location>
             <name>Southend</name>
@@ -20897,7 +20897,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Stansted Mountfitchet</_name>
+          <name>Stansted Mountfitchet</name>
           <coordinates>51.900000 0.200000</coordinates>
           <location>
             <name>Stansted Mountfitchet Airport</name>
@@ -20910,7 +20910,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Wainfleet</_name>
+          <name>Wainfleet</name>
           <coordinates>53.100000 0.250000</coordinates>
           <location>
             <name>Wainfleet</name>
@@ -20922,7 +20922,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Wattisham</_name>
+          <name>Wattisham</name>
           <coordinates>52.116667 0.950000</coordinates>
           <location>
             <name>Wattisham</name>
@@ -20935,7 +20935,7 @@
           <!-- A city in East and South East England in the United
                Kingdom
             -->
-          <_name>Wittering</_name>
+          <name>Wittering</name>
           <coordinates>52.600000 -0.450000</coordinates>
           <location>
             <name>Wittering</name>
@@ -20946,7 +20946,7 @@
       </state>
       <city>
         <!-- A city in the United Kingdom -->
-        <_name>Fairford</_name>
+        <name>Fairford</name>
         <coordinates>51.700000 -1.783333</coordinates>
         <location>
           <name>Fairford Royal Air Force Base</name>
@@ -20956,12 +20956,12 @@
       </city>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>Midlands</_name>
+        <name>Midlands</name>
         <fips-code>UKD2|UKD3|UKH4|UKH5|UKH7|UKJ1|UKJ8|UKJ9|UKL4</fips-code>
         <fips-code>UKA7|UKC7|UKD7|UKF7|UKL6|UKL7|UKM2|UKM9|UKN4|UKO2|UKO8|UKP3|UKQ3|UKQ4</fips-code>
         <city>
           <!-- A city in Midlands in the United Kingdom -->
-          <_name msgctxt="City in Midlands, United Kingdom">Birmingham</_name>
+          <name msgctxt="City in Midlands, United Kingdom">Birmingham</name>
           <coordinates>52.466667 -1.916667</coordinates>
           <location>
             <name>Birmingham Airport</name>
@@ -20972,7 +20972,7 @@
         </city>
         <city>
           <!-- A city in Midlands in the United Kingdom -->
-          <_name>Castle Donington</_name>
+          <name>Castle Donington</name>
           <coordinates>52.833333 -1.333333</coordinates>
           <location>
             <name>East Midlands</name>
@@ -20983,7 +20983,7 @@
         </city>
         <city>
           <!-- A city in Midlands in the United Kingdom -->
-          <_name>Cottesmore</_name>
+          <name>Cottesmore</name>
           <coordinates>52.700000 -0.650000</coordinates>
           <location>
             <name>Cottesmore</name>
@@ -20993,7 +20993,7 @@
         </city>
         <city>
           <!-- A city in Midlands in the United Kingdom -->
-          <_name>Coventry</_name>
+          <name>Coventry</name>
           <coordinates>52.416667 -1.550000</coordinates>
           <location>
             <name>Coventry Airport</name>
@@ -21003,7 +21003,7 @@
         </city>
         <city>
           <!-- A city in Midlands in the United Kingdom -->
-          <_name>Cranfield</_name>
+          <name>Cranfield</name>
           <coordinates>52.066667 -0.600000</coordinates>
           <location>
             <name>Cranfield</name>
@@ -21015,11 +21015,11 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>North East England</_name>
+        <name>North East England</name>
         <fips-code>UKD1|UKD8|UKE5|UKF5|UKI7|UKJ5|UKJ6|UKK9|UKM7|UKN3|UKN6</fips-code>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name>Coningsby</_name>
+          <name>Coningsby</name>
           <coordinates>53.116667 -0.166667</coordinates>
           <location>
             <name>Coningsby Royal Air Force Base</name>
@@ -21029,7 +21029,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name>Cranwell</_name>
+          <name>Cranwell</name>
           <coordinates>53.033333 -0.466667</coordinates>
           <location>
             <name>Cranwell</name>
@@ -21039,7 +21039,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name>Dishforth</_name>
+          <name>Dishforth</name>
           <coordinates>54.150000 -1.416667</coordinates>
           <location>
             <name>Disforth</name>
@@ -21049,7 +21049,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name msgctxt="City in North East England, United Kingdom">Newcastle</_name>
+          <name msgctxt="City in North East England, United Kingdom">Newcastle</name>
           <coordinates>54.988056 -1.619444</coordinates>
           <location>
             <name>Newcastle</name>
@@ -21060,7 +21060,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name msgctxt="City in North East England, United Kingdom">Stockton</_name>
+          <name msgctxt="City in North East England, United Kingdom">Stockton</name>
           <coordinates>54.583333 -1.416667</coordinates>
           <location>
             <name>Tees-Side</name>
@@ -21070,7 +21070,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name>Topcliffe</_name>
+          <name>Topcliffe</name>
           <coordinates>54.183333 -1.383333</coordinates>
           <location>
             <name>Topcliffe Royal Air Force Base</name>
@@ -21080,7 +21080,7 @@
         </city>
         <city>
           <!-- A city in North East England in the United Kingdom -->
-          <_name>Waddington</_name>
+          <name>Waddington</name>
           <coordinates>53.166667 -0.533333</coordinates>
           <location>
             <name>Waddington</name>
@@ -21091,12 +21091,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>North West England</_name>
+        <name>North West England</name>
         <fips-code>UKA8|UKA9|UKB1|UKC1|UKC5|UKC9|UKE9|UKG9|UKH2|UKH8|UKI2|UKK1|UKL2|UKL5|UKL8|UKN1|UKN2|UKO1|UKO6|UKP2|UKP7|UKQ1</fips-code>
         <fips-code>UKA3|UKB4|UKC2|UKD5|UKE1|UKG6|UKG8|UKH3|UKJ2|UKJ3|UKJ7|UKL3|UKL9|UKO7|UKQ5</fips-code>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Blackpool</_name>
+          <name>Blackpool</name>
           <coordinates>53.816667 -3.050000</coordinates>
           <location>
             <name>Blackpool Airport</name>
@@ -21107,7 +21107,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Carlisle</_name>
+          <name>Carlisle</name>
           <coordinates>54.883333 -2.933333</coordinates>
           <location>
             <name>Carlisle</name>
@@ -21124,7 +21124,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Church Fenton</_name>
+          <name>Church Fenton</name>
           <coordinates>53.816667 -1.216667</coordinates>
           <location>
             <name>Church Fenton</name>
@@ -21134,7 +21134,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Kirmington</_name>
+          <name>Kirmington</name>
           <coordinates>53.583333 -0.333333</coordinates>
           <location>
             <name>Humberside</name>
@@ -21144,7 +21144,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Leeds</_name>
+          <name>Leeds</name>
           <coordinates>53.800000 -1.583333</coordinates>
           <location>
             <name>Leeds And Bradford</name>
@@ -21155,7 +21155,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Leeming Bar</_name>
+          <name>Leeming Bar</name>
           <coordinates>54.300000 -1.550000</coordinates>
           <location>
             <name>Leeming</name>
@@ -21165,7 +21165,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Linton upon Ouse</_name>
+          <name>Linton upon Ouse</name>
           <coordinates>54.033333 -1.250000</coordinates>
           <location>
             <name>Linton upon Ouse</name>
@@ -21175,7 +21175,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name msgctxt="City in North West England, United Kingdom">Liverpool</_name>
+          <name msgctxt="City in North West England, United Kingdom">Liverpool</name>
           <coordinates>53.416667 -3.000000</coordinates>
           <location>
             <name>Liverpool Airport</name>
@@ -21186,7 +21186,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name msgctxt="City in North West England, United Kingdom">Manchester</_name>
+          <name msgctxt="City in North West England, United Kingdom">Manchester</name>
           <coordinates>53.500000 -2.216667</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -21197,7 +21197,7 @@
         </city>
         <city>
           <!-- A city in North West England in the United Kingdom -->
-          <_name>Shawbury</_name>
+          <name>Shawbury</name>
           <coordinates>52.783333 -2.650000</coordinates>
           <location>
             <name>Shawbury</name>
@@ -21209,11 +21209,11 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>Northern Ireland</_name>
+        <name>Northern Ireland</name>
         <fips-code>UKQ6|UKQ7|UKQ8|UKQ9|UKR1|UKR2|UKR3|UKR4|UKR5|UKR6|UKR7|UKR8|UKR9|UKS1|UKS2|UKS3|UKS4|UKS5|UKS6|UKS7|UKS8|UKS9|UKT1|UKT2|UKT3|UKT4</fips-code>
         <city>
           <!-- A city in Northern Ireland in the United Kingdom -->
-          <_name>Belfast</_name>
+          <name>Belfast</name>
           <coordinates>54.583333 -5.933333</coordinates>
           <location>
             <name>Belfast / Harbour</name>
@@ -21230,7 +21230,7 @@
         </city>
         <city>
           <!-- A city in Northern Ireland in the United Kingdom -->
-          <_name>Eglinton</_name>
+          <name>Eglinton</name>
           <coordinates>55.016667 -7.183333</coordinates>
           <location>
             <name>Eglinton / Londonderry</name>
@@ -21242,11 +21242,11 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>Scotland</_name>
+        <name>Scotland</name>
         <fips-code>UKT5|UKT6|UKT7|UKT8|UKT9|UKU1|UKU2|UKU3|UKU4|UKU5|UKU6|UKU7|UKU8|UKU9|UKV1|UKV2|UKV3|UKV4|UKV5|UKV6|UKV7|UKV8|UKV9|UKW1|UKW2|UKW3|UKW4|UKW5|UKW6|UKW7|UKW8|UKW9</fips-code>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name msgctxt="City in Scotland, United Kingdom">Aberdeen</_name>
+          <name msgctxt="City in Scotland, United Kingdom">Aberdeen</name>
           <coordinates>57.133333 -2.100000</coordinates>
           <location>
             <name>Aberdeen / Dyce</name>
@@ -21257,7 +21257,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Campbeltown</_name>
+          <name>Campbeltown</name>
           <coordinates>55.433333 -5.633333</coordinates>
           <location>
             <name>Campbeltown</name>
@@ -21267,7 +21267,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Dundee</_name>
+          <name>Dundee</name>
           <coordinates>56.500000 -2.966667</coordinates>
           <location>
             <name>Dundee / Riverside</name>
@@ -21278,7 +21278,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Edinburgh</_name>
+          <name>Edinburgh</name>
           <coordinates>55.950000 -3.200000</coordinates>
           <location>
             <name>Edinburgh Airport</name>
@@ -21289,7 +21289,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name msgctxt="City in Scotland, United Kingdom">Glasgow</_name>
+          <name msgctxt="City in Scotland, United Kingdom">Glasgow</name>
           <coordinates>55.833333 -4.250000</coordinates>
           <location>
             <name>Glasgow Airport</name>
@@ -21300,7 +21300,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Gramisdale</_name>
+          <name>Gramisdale</name>
           <coordinates>57.483333 -7.333333</coordinates>
           <location>
             <name>Benbecula</name>
@@ -21310,7 +21310,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Inverness</_name>
+          <name>Inverness</name>
           <coordinates>57.466667 -4.233333</coordinates>
           <location>
             <name>Inverness / Dalcross</name>
@@ -21321,7 +21321,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Kilmoluag</_name>
+          <name>Kilmoluag</name>
           <coordinates>56.500000 -6.916667</coordinates>
           <location>
             <name>Tiree</name>
@@ -21332,7 +21332,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Kinloss</_name>
+          <name>Kinloss</name>
           <coordinates>57.616667 -3.566667</coordinates>
           <location>
             <name>Kinloss</name>
@@ -21343,7 +21343,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Kintra</_name>
+          <name>Kintra</name>
           <coordinates>55.650000 -6.250000</coordinates>
           <location>
             <name>Islay</name>
@@ -21353,7 +21353,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Kirkwall</_name>
+          <name>Kirkwall</name>
           <coordinates>58.966667 -2.950000</coordinates>
           <location>
             <name>Kirkwall Airport</name>
@@ -21364,7 +21364,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Leuchars</_name>
+          <name>Leuchars</name>
           <coordinates>56.383333 -2.883333</coordinates>
           <location>
             <name>Leuchars</name>
@@ -21374,7 +21374,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Lossiemouth</_name>
+          <name>Lossiemouth</name>
           <coordinates>57.700000 -3.283333</coordinates>
           <location>
             <name>Lossiemouth</name>
@@ -21385,7 +21385,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Mossbank</_name>
+          <name>Mossbank</name>
           <coordinates>60.450000 -1.200000</coordinates>
           <location>
             <name>Scatsa / Shetland Island</name>
@@ -21396,7 +21396,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Prestwick</_name>
+          <name>Prestwick</name>
           <coordinates>55.483333 -4.616667</coordinates>
           <location>
             <name>Prestwick Airport</name>
@@ -21406,7 +21406,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Stornoway</_name>
+          <name>Stornoway</name>
           <coordinates>58.216667 -6.366667</coordinates>
           <location>
             <name>Stornoway</name>
@@ -21417,7 +21417,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Sumburgh</_name>
+          <name>Sumburgh</name>
           <coordinates>59.866667 -1.283333</coordinates>
           <location>
             <name>Sumburgh Cape</name>
@@ -21427,7 +21427,7 @@
         </city>
         <city>
           <!-- A city in Scotland in the United Kingdom -->
-          <_name>Wick</_name>
+          <name>Wick</name>
           <coordinates>58.433333 -3.083333</coordinates>
           <location>
             <name>Wick</name>
@@ -21438,13 +21438,13 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>South and South West England</_name>
+        <name>South and South West England</name>
         <fips-code>UKA4|UKB2|UKB7|UKC6|UKD4|UKD6|UKE6|UKJ4|UKK4|UKK5|UKM3|UKM6|UKN9|UKO4|UKP8</fips-code>
         <city>
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Boscombe</_name>
+          <name>Boscombe</name>
           <coordinates>51.150000 -1.716667</coordinates>
           <location>
             <name>Boscombe Down</name>
@@ -21457,7 +21457,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Bournemouth</_name>
+          <name>Bournemouth</name>
           <coordinates>50.716667 -1.883333</coordinates>
           <location>
             <name>Bournemouth Airport</name>
@@ -21470,7 +21470,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Bristol</_name>
+          <name>Bristol</name>
           <coordinates>51.450000 -2.583333</coordinates>
           <location>
             <name>Bristol / Lulsgate</name>
@@ -21483,7 +21483,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Butes</_name>
+          <name>Butes</name>
           <coordinates>49.717500 -2.202500</coordinates>
           <location>
             <name>Alderney / Channel Island</name>
@@ -21495,7 +21495,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Exeter</_name>
+          <name>Exeter</name>
           <coordinates>50.700000 -3.533333</coordinates>
           <location>
             <name>Exeter Airport</name>
@@ -21508,7 +21508,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Filton</_name>
+          <name>Filton</name>
           <coordinates>51.508611 -2.574722</coordinates>
           <location>
             <name>Filton Private</name>
@@ -21520,7 +21520,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Helston</_name>
+          <name>Helston</name>
           <coordinates>50.099722 -5.272222</coordinates>
           <location>
             <name>Culdrose</name>
@@ -21532,7 +21532,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Hugh Town</_name>
+          <name>Hugh Town</name>
           <coordinates>49.916667 -6.316667</coordinates>
           <location>
             <name>Scilly, Saint Mary's</name>
@@ -21545,7 +21545,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Lyneham</_name>
+          <name>Lyneham</name>
           <coordinates>51.516667 -1.966667</coordinates>
           <location>
             <name>Lyneham</name>
@@ -21557,7 +21557,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Middle Wallop</_name>
+          <name>Middle Wallop</name>
           <coordinates>51.133333 -1.583333</coordinates>
           <location>
             <name>Middle Wallop</name>
@@ -21569,7 +21569,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name msgctxt="City in South and South West England, United Kingdom">Plymouth</_name>
+          <name msgctxt="City in South and South West England, United Kingdom">Plymouth</name>
           <coordinates>50.396389 -4.138611</coordinates>
           <location>
             <name>Plymouth / Roborough</name>
@@ -21582,7 +21582,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Staverton</_name>
+          <name>Staverton</name>
           <coordinates>51.916667 -2.166667</coordinates>
           <location>
             <name>Staverton Private</name>
@@ -21594,7 +21594,7 @@
           <!-- A city in South and South West England in the United
                Kingdom
             -->
-          <_name>Yeovilton</_name>
+          <name>Yeovilton</name>
           <coordinates>51.004167 -2.650278</coordinates>
           <location>
             <name>Yeovilton</name>
@@ -21606,13 +21606,13 @@
       </state>
       <state>
         <!-- A state/province/territory in United Kingdom -->
-        <_name>Wales</_name>
+        <name>Wales</name>
         <fips-code>UKX1|UKX2|UKX3|UKX4|UKX5|UKX6|UKX7|UKX8|UKX9|UKY1|UKY2|UKY3|UKY4|UKY5|UKY6|UKY7|UKY8|UKY9|UKZ1|UKZ2|UKZ3|UKZ4</fips-code>
         <city>
           <!-- A city in Wales in the United Kingdom.
                The local name in Welsh is "Caerdydd".
             -->
-          <_name msgctxt="City in Wales, United Kingdom">Cardiff</_name>
+          <name msgctxt="City in Wales, United Kingdom">Cardiff</name>
           <coordinates>51.500000 -3.200000</coordinates>
           <location>
             <name>Cardiff-Wales Airport</name>
@@ -21623,7 +21623,7 @@
         </city>
         <city>
           <!-- A city in Wales in the United Kingdom -->
-          <_name>Hawarden</_name>
+          <name>Hawarden</name>
           <coordinates>53.183333 -3.033333</coordinates>
           <location>
             <name>Hawarden</name>
@@ -21633,7 +21633,7 @@
         </city>
         <city>
           <!-- A city in Wales in the United Kingdom -->
-          <_name>Pembrey</_name>
+          <name>Pembrey</name>
           <coordinates>51.689167 -4.277222</coordinates>
           <location>
             <name>Pembrey Sands</name>
@@ -21644,7 +21644,7 @@
         </city>
         <city>
           <!-- A city in Wales in the United Kingdom -->
-          <_name>Saint Athan</_name>
+          <name>Saint Athan</name>
           <coordinates>51.402778 -3.413889</coordinates>
           <location>
             <name>St Athan Royal Air Force Base</name>
@@ -21655,7 +21655,7 @@
         </city>
         <city>
           <!-- A city in Wales in the United Kingdom -->
-          <_name>Valley</_name>
+          <name>Valley</name>
           <coordinates>53.283333 -4.566667</coordinates>
           <location>
             <name>Valley</name>
@@ -21668,7 +21668,7 @@
     </country>
     <country>
       <!-- VA - Holy See (Vatican City State) -->
-      <_name>Vatican City</_name>
+      <name>Vatican City</name>
       <iso-code>VA</iso-code>
       <fips-code>VT</fips-code>
       <timezones>
@@ -21678,7 +21678,7 @@
     </country>
     <country>
       <!-- AX - Åland Islands, an autonomous province of Finland -->
-      <_name>Åland Islands</_name>
+      <name>Åland Islands</name>
       <iso-code>AX</iso-code>
       <fips-code>FI01</fips-code>
       <pref-lang>swe</pref-lang>
@@ -21690,7 +21690,7 @@
         <!-- A city in the Åland Islands.
              The local name in Finnish is "Maarianhamina".
           -->
-        <_name>Mariehamn</_name>
+        <name>Mariehamn</name>
         <coordinates>60.100000 19.950000</coordinates>
         <location>
           <name>Mariehamn / Aland Island</name>
@@ -21701,10 +21701,10 @@
     </country>
   </region>
   <region>
-    <_name>Middle East</_name>
+    <name>Middle East</name>
     <country>
       <!-- BH - Bahrain -->
-      <_name>Bahrain</_name>
+      <name>Bahrain</name>
       <iso-code>BH</iso-code>
       <fips-code>BA</fips-code>
       <timezones>
@@ -21715,7 +21715,7 @@
         <!-- A city in Bahrain.
              The name is also written "الحد".
           -->
-        <_name>Al Hadd</_name>
+        <name>Al Hadd</name>
         <coordinates>26.245556 50.654167</coordinates>
         <location>
           <name>Bahrain International Airport</name>
@@ -21728,7 +21728,7 @@
              "Manama" is the traditional English name.
              The local name in Arabic is "Al Manamah / المنامة".
           -->
-        <_name>Manama</_name>
+        <name>Manama</name>
         <coordinates>26.236111 50.583056</coordinates>
         <location>
           <name>Bahrain International Airport</name>
@@ -21739,7 +21739,7 @@
     </country>
     <country>
       <!-- IR - Islamic Republic of Iran -->
-      <_name>Iran</_name>
+      <name>Iran</name>
       <!-- Could not find information about the following stations,
            which may be in Iran:
            OIBP OICJ OIGK OIHM OIIE OIKO OIMD OINB OINK OINZ OITU 
@@ -21754,7 +21754,7 @@
         <!-- A city in Iran.
              The name is also written "آبادان".
           -->
-        <_name>Abadan</_name>
+        <name>Abadan</name>
         <coordinates>30.339200 48.304300</coordinates>
         <location>
           <name>Abadan</name>
@@ -21764,7 +21764,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Abadeh</_name>
+        <name>Abadeh</name>
         <coordinates>31.160833 52.650556</coordinates>
         <location>
           <name>Abadeh</name>
@@ -21774,7 +21774,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Abū Mūsā</_name>
+        <name>Abū Mūsā</name>
         <coordinates>25.914444 54.995278</coordinates>
         <location>
           <name>Abumusa Island, Abumusa Airport</name>
@@ -21791,7 +21791,7 @@
         <!-- A city in Iran.
              The name is also written "آغاجاری".
           -->
-        <_name>Aghajari</_name>
+        <name>Aghajari</name>
         <coordinates>30.700600 49.831500</coordinates>
         <location>
           <name>Aghajari</name>
@@ -21803,7 +21803,7 @@
         <!-- A city in Iran.
              The name is also written "اهواز".
           -->
-        <_name>Ahvaz</_name>
+        <name>Ahvaz</name>
         <coordinates>31.320300 48.669300</coordinates>
         <location>
           <name>Ahvaz</name>
@@ -21815,7 +21815,7 @@
         <!-- A city in Iran.
              The name is also written "اردبيل".
           -->
-        <_name>Ardabil</_name>
+        <name>Ardabil</name>
         <coordinates>38.249800 48.293300</coordinates>
         <location>
           <name>Ardabil</name>
@@ -21827,7 +21827,7 @@
         <!-- A city in Iran.
              The name is also written "بندر عباس".
           -->
-        <_name>Bandar 'Abbas</_name>
+        <name>Bandar 'Abbas</name>
         <coordinates>27.186500 56.280800</coordinates>
         <location>
           <name>Bandar 'Abbas</name>
@@ -21839,7 +21839,7 @@
         <!-- A city in Iran.
              The name is also written "بندر بوشهر".
           -->
-        <_name>Bandar-e Bushehr</_name>
+        <name>Bandar-e Bushehr</name>
         <coordinates>28.968400 50.838500</coordinates>
         <location>
           <name>Bandar-e Bushehr Airport</name>
@@ -21851,7 +21851,7 @@
         <!-- A city in Iran.
              The name is also written "بندر لنگه".
           -->
-        <_name>Bandar-e Lengeh</_name>
+        <name>Bandar-e Lengeh</name>
         <coordinates>26.556111 54.880833</coordinates>
         <location>
           <name>Bandar Lengeh</name>
@@ -21863,7 +21863,7 @@
         <!-- A city in Iran.
              The name is also written "بندر ماهشهر".
           -->
-        <_name>Bandar-e Mahshahr</_name>
+        <name>Bandar-e Mahshahr</name>
         <coordinates>30.558800 49.198100</coordinates>
         <location>
           <name>Mahshahr Airport</name>
@@ -21873,7 +21873,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Birjand</_name>
+        <name>Birjand</name>
         <coordinates>32.873889 59.214444</coordinates>
         <location>
           <name>Birjand</name>
@@ -21885,7 +21885,7 @@
         <!-- A city in Iran.
              The name is also written "چاه بهار".
           -->
-        <_name>Chah Bahar</_name>
+        <name>Chah Bahar</name>
         <coordinates>25.291900 60.643000</coordinates>
         <location>
           <name>Chah Bahar</name>
@@ -21897,7 +21897,7 @@
         <!-- A city in Iran.
              The name is also written "ديرستان".
           -->
-        <_name>Dayrestan</_name>
+        <name>Dayrestan</name>
         <coordinates>26.746300 55.934900</coordinates>
         <location>
           <name>Gheshm Island, Dayrestan Airport</name>
@@ -21909,7 +21909,7 @@
         <!-- A city in Iran.
              The name is also written "دو گنبدان".
           -->
-        <_name>Do Gonbadan</_name>
+        <name>Do Gonbadan</name>
         <coordinates>30.358600 50.798100</coordinates>
         <location>
           <name>Gach Saran du Gunbadan</name>
@@ -21919,7 +21919,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Esfahan</_name>
+        <name>Esfahan</name>
         <coordinates>32.659722 51.671389</coordinates>
         <location>
           <name>Esfahan</name>
@@ -21931,7 +21931,7 @@
         <!-- A city in Iran.
              The name is also written "فسا".
           -->
-        <_name>Fasa</_name>
+        <name>Fasa</name>
         <coordinates>28.938300 53.648200</coordinates>
         <location>
           <name>Fasa</name>
@@ -21943,7 +21943,7 @@
         <!-- A city in Iran.
              The name is also written "گرگان".
           -->
-        <_name>Gorgan</_name>
+        <name>Gorgan</name>
         <coordinates>36.839444 54.436111</coordinates>
         <location>
           <name>Gorgan</name>
@@ -21955,7 +21955,7 @@
         <!-- A city in Iran.
              The name is also written "گوشه شاهزاده قاسم".
           -->
-        <_name>Gusheh Shahzadeh Qasem</_name>
+        <name>Gusheh Shahzadeh Qasem</name>
         <coordinates>30.700000 51.550000</coordinates>
         <location>
           <name>Yasouj, National Airport</name>
@@ -21967,7 +21967,7 @@
         <!-- A city in Iran.
              The name is also written "همدان".
           -->
-        <_name>Hamadan</_name>
+        <name>Hamadan</name>
         <coordinates>34.796111 48.515833</coordinates>
         <location>
           <name>Hamadan</name>
@@ -21979,7 +21979,7 @@
         <!-- A city in Iran.
              The name is also written "يلام".
           -->
-        <_name>Ilam</_name>
+        <name>Ilam</name>
         <coordinates>33.637400 46.422700</coordinates>
         <location>
           <name>Ilam</name>
@@ -21989,7 +21989,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Iranshahr</_name>
+        <name>Iranshahr</name>
         <coordinates>27.203889 60.691944</coordinates>
         <location>
           <name>Iranshahr</name>
@@ -22001,7 +22001,7 @@
         <!-- A city in Iran.
              The name is also written "كرج".
           -->
-        <_name>Karaj</_name>
+        <name>Karaj</name>
         <coordinates>35.835500 51.010300</coordinates>
         <location>
           <name>Payam Airport</name>
@@ -22011,7 +22011,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Kashan</_name>
+        <name>Kashan</name>
         <coordinates>33.983611 51.447500</coordinates>
         <location>
           <name>Kashan</name>
@@ -22021,7 +22021,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Kerman</_name>
+        <name>Kerman</name>
         <coordinates>30.293889 57.084167</coordinates>
         <location>
           <name>Kerman</name>
@@ -22031,7 +22031,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Kermanshah</_name>
+        <name>Kermanshah</name>
         <coordinates>34.314167 47.065000</coordinates>
         <location>
           <name>Kermanshah</name>
@@ -22043,7 +22043,7 @@
         <!-- A city in Iran.
              The name is also written "خرم آباد".
           -->
-        <_name>Khorramabad</_name>
+        <name>Khorramabad</name>
         <coordinates>33.487778 48.355833</coordinates>
         <location>
           <name>Khorramabad</name>
@@ -22055,7 +22055,7 @@
         <!-- A city in Iran.
              The name is also written "كيش".
           -->
-        <_name>Kish</_name>
+        <name>Kish</name>
         <coordinates>26.557778 54.019444</coordinates>
         <location>
           <name>Kish Island, Kish Airport</name>
@@ -22065,7 +22065,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Lar</_name>
+        <name>Lar</name>
         <coordinates>27.684167 54.343611</coordinates>
         <location>
           <name>Lar</name>
@@ -22077,7 +22077,7 @@
         <!-- A city in Iran.
              The name is also written "مشهد".
           -->
-        <_name>Mashhad</_name>
+        <name>Mashhad</name>
         <coordinates>36.297000 59.606200</coordinates>
         <location>
           <name>Mashhad</name>
@@ -22089,7 +22089,7 @@
         <!-- A city in Iran.
              The name is also written "مسجد سلیمان".
           -->
-        <_name>Masjed Soleyman</_name>
+        <name>Masjed Soleyman</name>
         <coordinates>31.936400 49.303900</coordinates>
         <location>
           <name>Masjed Soleyman</name>
@@ -22101,7 +22101,7 @@
         <!-- A city in Iran.
              The name is also written "نو شهر".
           -->
-        <_name>Now Shahr</_name>
+        <name>Now Shahr</name>
         <coordinates>36.645278 51.495833</coordinates>
         <location>
           <name>Now Shahr</name>
@@ -22113,7 +22113,7 @@
         <!-- A city in Iran.
              The name is also written "ارومیه".
           -->
-        <_name>Orumiyeh</_name>
+        <name>Orumiyeh</name>
         <coordinates>37.555300 45.072400</coordinates>
         <location>
           <name>Orumiyeh</name>
@@ -22125,7 +22125,7 @@
         <!-- A city in Iran.
              The name is also written "قزوین".
           -->
-        <_name>Qazvin</_name>
+        <name>Qazvin</name>
         <coordinates>36.268200 50.000000</coordinates>
         <location>
           <name>Ghazvin</name>
@@ -22135,7 +22135,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Rasht</_name>
+        <name>Rasht</name>
         <coordinates>37.279444 49.585833</coordinates>
         <location>
           <name>Rasht</name>
@@ -22145,7 +22145,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Sabzevar</_name>
+        <name>Sabzevar</name>
         <coordinates>36.214444 57.679722</coordinates>
         <location>
           <name>Sabzevar</name>
@@ -22157,7 +22157,7 @@
         <!-- A city in Iran.
              The name is also written "سخت سر".
           -->
-        <_name>Sakht Sar</_name>
+        <name>Sakht Sar</name>
         <coordinates>36.900278 50.682500</coordinates>
         <location>
           <name>Sakht Sar</name>
@@ -22167,7 +22167,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Sanandaj</_name>
+        <name>Sanandaj</name>
         <coordinates>35.318100 47.000100</coordinates>
         <location>
           <name>Sanandaj</name>
@@ -22177,7 +22177,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Sarakhs</_name>
+        <name>Sarakhs</name>
         <coordinates>36.534722 61.161111</coordinates>
         <location>
           <name>Sarakhs</name>
@@ -22189,7 +22189,7 @@
         <!-- A city in Iran.
              The name is also written "سمنان".
           -->
-        <_name>Semnan</_name>
+        <name>Semnan</name>
         <coordinates>35.575278 53.394167</coordinates>
         <location>
           <name>Semnan</name>
@@ -22201,7 +22201,7 @@
         <!-- A city in Iran.
              The name is also written "شهر بالا".
           -->
-        <_name>Shahr-e Bala</_name>
+        <name>Shahr-e Bala</name>
         <coordinates>26.674444 57.780556</coordinates>
         <location>
           <name>Jask</name>
@@ -22213,7 +22213,7 @@
         <!-- A city in Iran.
              The name is also written "شهر كرد".
           -->
-        <_name>Shahr-e Kord</_name>
+        <name>Shahr-e Kord</name>
         <coordinates>32.325556 50.864444</coordinates>
         <location>
           <name>Shahr-e Kord</name>
@@ -22225,7 +22225,7 @@
         <!-- A city in Iran.
              The name is also written "شیراز".
           -->
-        <_name>Shiraz</_name>
+        <name>Shiraz</name>
         <coordinates>29.603600 52.538800</coordinates>
         <location>
           <name>Shiraz</name>
@@ -22235,7 +22235,7 @@
       </city>
       <city>
         <!-- A city in Iran -->
-        <_name>Tabas</_name>
+        <name>Tabas</name>
         <coordinates>33.588333 56.922500</coordinates>
         <location>
           <name>Tabas</name>
@@ -22247,7 +22247,7 @@
         <!-- A city in Iran.
              The name is also written "تبريز".
           -->
-        <_name>Tabriz</_name>
+        <name>Tabriz</name>
         <coordinates>38.080000 46.291900</coordinates>
         <location>
           <name>Tabriz</name>
@@ -22259,7 +22259,7 @@
         <!-- The capital of Iran.
              The name is also written "تهران".
           -->
-        <_name>Tehran</_name>
+        <name>Tehran</name>
         <coordinates>35.705000 51.421600</coordinates>
         <location>
           <name>Tehran-Mehrabad</name>
@@ -22271,7 +22271,7 @@
         <!-- A city in Iran.
              The name is also written "يزد".
           -->
-        <_name>Yazd</_name>
+        <name>Yazd</name>
         <coordinates>31.897222 54.367500</coordinates>
         <location>
           <name>Yazd</name>
@@ -22283,7 +22283,7 @@
         <!-- A city in Iran.
              The name is also written "زابل".
           -->
-        <_name>Zabol</_name>
+        <name>Zabol</name>
         <coordinates>31.028700 61.501200</coordinates>
         <location>
           <name>Zabol</name>
@@ -22295,7 +22295,7 @@
         <!-- A city in Iran.
              The name is also written "زاهدان (کي)".
           -->
-        <_name>Zahedan-e (Yek)</_name>
+        <name>Zahedan-e (Yek)</name>
         <coordinates>29.496300 60.862900</coordinates>
         <location>
           <name>Zahedan-e (Yek)</name>
@@ -22306,7 +22306,7 @@
     </country>
     <country>
       <!-- IQ - Iraq -->
-      <_name>Iraq</_name>
+      <name>Iraq</name>
       <!-- Could not find weather stations for the following major
            cities:
            Baghdad
@@ -22320,7 +22320,7 @@
     </country>
     <country>
       <!-- IL - Israel -->
-      <_name>Israel</_name>
+      <name>Israel</name>
       <iso-code>IL</iso-code>
       <fips-code>IS</fips-code>
       <timezones>
@@ -22329,7 +22329,7 @@
       <tz-hint>Asia/Jerusalem</tz-hint>
       <city>
         <!-- A city in Israel -->
-        <_name>Elat</_name>
+        <name>Elat</name>
         <coordinates>29.561111 34.951667</coordinates>
         <location>
           <name>Elat</name>
@@ -22339,7 +22339,7 @@
       </city>
       <city>
         <!-- A city in Israel -->
-        <_name>Mahanayim</_name>
+        <name>Mahanayim</name>
         <coordinates>32.983333 35.566667</coordinates>
         <location>
           <name>Galilee / Pina</name>
@@ -22349,7 +22349,7 @@
       </city>
       <city>
         <!-- A city in Israel -->
-        <_name>Mahane Yisra'el</_name>
+        <name>Mahane Yisra'el</name>
         <coordinates>32.000000 34.916667</coordinates>
         <location>
           <name>Ben-Gurion International Airport</name>
@@ -22359,7 +22359,7 @@
       </city>
       <city>
         <!-- A city in Israel -->
-        <_name>Ramot Remez</_name>
+        <name>Ramot Remez</name>
         <coordinates>32.781667 35.016667</coordinates>
         <location>
           <name>Sde-Haifa Haifa</name>
@@ -22369,7 +22369,7 @@
       </city>
       <city>
         <!-- A city in Israel -->
-        <_name>Shizzafon</_name>
+        <name>Shizzafon</name>
         <coordinates>30.041667 35.027778</coordinates>
         <location>
           <name>Ovda</name>
@@ -22379,7 +22379,7 @@
       </city>
       <city>
         <!-- A city in Israel -->
-        <_name>Tel Aviv</_name>
+        <name>Tel Aviv</name>
         <coordinates>32.066667 34.766667</coordinates>
         <location>
           <name>Sde-Dov Airport</name>
@@ -22390,7 +22390,7 @@
     </country>
     <country>
       <!-- JO - Jordan -->
-      <_name msgctxt="Country">Jordan</_name>
+      <name msgctxt="Country">Jordan</name>
       <iso-code>JO</iso-code>
       <fips-code>JO</fips-code>
       <timezones>
@@ -22399,7 +22399,7 @@
       <tz-hint>Asia/Amman</tz-hint>
       <city>
         <!-- A city in Jordan -->
-        <_name>Al 'Aqabah</_name>
+        <name>Al 'Aqabah</name>
         <coordinates>29.526667 35.007778</coordinates>
         <location>
           <name>Al 'Aqabah Airport</name>
@@ -22409,7 +22409,7 @@
       </city>
       <city>
         <!-- A city in Jordan -->
-        <_name>Al Jizah</_name>
+        <name>Al Jizah</name>
         <coordinates>31.700000 35.950000</coordinates>
         <location>
           <name>Queen Alia Airport</name>
@@ -22422,7 +22422,7 @@
              "Amman" is the traditional English name.
              The local name in Arabic is "'Amman".
           -->
-        <_name>Amman</_name>
+        <name>Amman</name>
         <coordinates>31.950000 35.933333</coordinates>
         <location>
           <name>Amman Airport</name>
@@ -22433,7 +22433,7 @@
     </country>
     <country>
       <!-- KW - Kuwait -->
-      <_name msgctxt="Country">Kuwait</_name>
+      <name msgctxt="Country">Kuwait</name>
       <iso-code>KW</iso-code>
       <fips-code>KU</fips-code>
       <timezones>
@@ -22445,7 +22445,7 @@
              "Kuwait" is the traditional English name.
              The local name in Arabic is "Al Kuwayt / الكويت".
           -->
-        <_name msgctxt="City in Kuwait">Kuwait</_name>
+        <name msgctxt="City in Kuwait">Kuwait</name>
         <coordinates>29.369722 47.978333</coordinates>
         <location>
           <name>Kuwait International Airport</name>
@@ -22456,7 +22456,7 @@
     </country>
     <country>
       <!-- LB - Lebanon -->
-      <_name msgctxt="Country">Lebanon</_name>
+      <name msgctxt="Country">Lebanon</name>
       <iso-code>LB</iso-code>
       <fips-code>LE</fips-code>
       <timezones>
@@ -22468,7 +22468,7 @@
              "Beirut" is the traditional English name.
              The local name is "Beyrouth".
           -->
-        <_name>Beirut</_name>
+        <name>Beirut</name>
         <coordinates>33.871944 35.509722</coordinates>
         <location>
           <name>Beirut Airport</name>
@@ -22479,7 +22479,7 @@
     </country>
     <country>
       <!-- OM - Oman -->
-      <_name>Oman</_name>
+      <name>Oman</name>
       <iso-code>OM</iso-code>
       <fips-code>MU</fips-code>
       <timezones>
@@ -22488,7 +22488,7 @@
       <tz-hint>Asia/Muscat</tz-hint>
       <city>
         <!-- A city in Oman -->
-        <_name>Mu'askar al Murtafi'ah</_name>
+        <name>Mu'askar al Murtafi'ah</name>
         <coordinates>23.563611 58.250000</coordinates>
         <location>
           <name>Seeb International Airport</name>
@@ -22501,7 +22501,7 @@
              "Muscat" is the traditional English name.
              The local name in Arabic is "Masqat".
           -->
-        <_name>Muscat</_name>
+        <name>Muscat</name>
         <coordinates>23.613333 58.593333</coordinates>
         <location>
           <name>Seeb International Airport</name>
@@ -22511,7 +22511,7 @@
       </city>
       <city>
         <!-- A city in Oman -->
-        <_name>Salalah</_name>
+        <name>Salalah</name>
         <coordinates>17.017500 54.082778</coordinates>
         <location>
           <name>Salalah</name>
@@ -22522,7 +22522,7 @@
     </country>
     <country>
       <!-- PS - Occupied Palestinian Territory -->
-      <_name>Palestinian Territory</_name>
+      <name>Palestinian Territory</name>
       <iso-code>PS</iso-code>
       <fips-code>GZ|WE</fips-code>
       <timezones>
@@ -22532,7 +22532,7 @@
     </country>
     <country>
       <!-- QA - Qatar -->
-      <_name>Qatar</_name>
+      <name>Qatar</name>
       <!-- Could not find information about the following stations,
            which may be in Qatar:
            KQA7 KQAE KQAJ KQAL KQAQ KQAR KQCO KQCQ KQD2 KQD9 KQDM KQDP
@@ -22551,7 +22551,7 @@
              "Doha" is the traditional English name.
              The local name in Arabic is "Ad Dawhah / الدوحة".
           -->
-        <_name>Doha</_name>
+        <name>Doha</name>
         <coordinates>25.286667 51.533333</coordinates>
         <location>
           <name>Doha International Airport</name>
@@ -22567,7 +22567,7 @@
     </country>
     <country>
       <!-- SA - Saudi Arabia -->
-      <_name>Saudi Arabia</_name>
+      <name>Saudi Arabia</name>
       <!-- Could not find information about the following stations,
            which may be in Saudi Arabia:
            OEDM OEKB OEKJ OEMH 
@@ -22580,7 +22580,7 @@
       <tz-hint>Asia/Riyadh</tz-hint>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>'Ar'ar</_name>
+        <name>'Ar'ar</name>
         <coordinates>30.985000 41.020556</coordinates>
         <location>
           <name>'Ar'ar</name>
@@ -22590,7 +22590,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Abha</_name>
+        <name>Abha</name>
         <coordinates>18.216389 42.505278</coordinates>
         <location>
           <name>Abha</name>
@@ -22600,7 +22600,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Ad Dalfa'ah</_name>
+        <name>Ad Dalfa'ah</name>
         <coordinates>26.326667 43.676389</coordinates>
         <location>
           <name>Gassim</name>
@@ -22610,7 +22610,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Ad Dammam</_name>
+        <name>Ad Dammam</name>
         <coordinates>26.425833 50.114167</coordinates>
         <location>
           <name>Dammam-King Fahd International Airport</name>
@@ -22620,7 +22620,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Al 'Aqiq</_name>
+        <name>Al 'Aqiq</name>
         <coordinates>20.266667 41.666667</coordinates>
         <location>
           <name>Al Baha</name>
@@ -22630,7 +22630,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Al Qaysumah</_name>
+        <name>Al Qaysumah</name>
         <coordinates>28.309722 46.127500</coordinates>
         <location>
           <name>Al Qaysumah</name>
@@ -22640,7 +22640,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Al Qurayyat</_name>
+        <name>Al Qurayyat</name>
         <coordinates>31.333333 37.341944</coordinates>
         <location>
           <name>Guriat</name>
@@ -22650,7 +22650,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Al Wajh</_name>
+        <name>Al Wajh</name>
         <coordinates>26.233333 36.466667</coordinates>
         <location>
           <name>Al Wajh</name>
@@ -22660,7 +22660,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Al Wuday'ah</_name>
+        <name>Al Wuday'ah</name>
         <coordinates>17.033333 47.116667</coordinates>
         <location>
           <name>Sharurah</name>
@@ -22670,7 +22670,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Ar Ruqayyiqah</_name>
+        <name>Ar Ruqayyiqah</name>
         <coordinates>25.350000 49.566667</coordinates>
         <location>
           <name>Al Ahsa</name>
@@ -22680,7 +22680,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>At Ta'if</_name>
+        <name>At Ta'if</name>
         <coordinates>21.270278 40.415833</coordinates>
         <location>
           <name>At Ta'if</name>
@@ -22693,7 +22693,7 @@
              "Dhahran" is the traditional English name.
              The local name in Arabic is "Az Zahran".
           -->
-        <_name>Dhahran</_name>
+        <name>Dhahran</name>
         <coordinates>26.304167 50.132500</coordinates>
         <location>
           <name>Dhahran</name>
@@ -22703,7 +22703,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Ha'il</_name>
+        <name>Ha'il</name>
         <coordinates>27.516389 41.696944</coordinates>
         <location>
           <name>Ha'il</name>
@@ -22713,7 +22713,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Jiddah</_name>
+        <name>Jiddah</name>
         <coordinates>21.516944 39.219167</coordinates>
         <location>
           <name>Jeddah King Abdul Aziz International Airport</name>
@@ -22723,7 +22723,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Jizan</_name>
+        <name>Jizan</name>
         <coordinates>16.889167 42.551111</coordinates>
         <location>
           <name>Jizan</name>
@@ -22733,7 +22733,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Khamis Mushayt</_name>
+        <name>Khamis Mushayt</name>
         <coordinates>18.306389 42.729167</coordinates>
         <location>
           <name>Khamis Mushayt</name>
@@ -22743,7 +22743,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Masjid Ibn Rashid</_name>
+        <name>Masjid Ibn Rashid</name>
         <coordinates>27.916667 45.400000</coordinates>
         <location>
           <name>Hafr Al-Batin</name>
@@ -22756,7 +22756,7 @@
              "Mecca" is the traditional English name.
              The local name in Arabic is "Makkah".
           -->
-        <_name>Mecca</_name>
+        <name>Mecca</name>
         <coordinates>21.426667 39.826111</coordinates>
         <location>
           <name>Mecca</name>
@@ -22769,7 +22769,7 @@
              "Medina" is the traditional English name.
              The local name in Arabic is "Al Madinah al Munawwarah".
           -->
-        <_name>Medina</_name>
+        <name>Medina</name>
         <coordinates>24.468611 39.614167</coordinates>
         <location>
           <name>Madinah</name>
@@ -22779,7 +22779,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Najran</_name>
+        <name>Najran</name>
         <coordinates>17.505556 44.184167</coordinates>
         <location>
           <name>Najran</name>
@@ -22789,7 +22789,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Qal'at Bishah</_name>
+        <name>Qal'at Bishah</name>
         <coordinates>20.000000 42.600000</coordinates>
         <location>
           <name>Qal'at Bishah</name>
@@ -22799,7 +22799,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Qara</_name>
+        <name>Qara</name>
         <coordinates>29.876944 40.226944</coordinates>
         <location>
           <name>Al-Jouf</name>
@@ -22809,7 +22809,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Rafha</_name>
+        <name>Rafha</name>
         <coordinates>29.638611 43.501389</coordinates>
         <location>
           <name>Rafha</name>
@@ -22822,7 +22822,7 @@
              "Riyadh" is the traditional English name.
              The local name in Arabic is "Ar Riyad".
           -->
-        <_name>Riyadh</_name>
+        <name>Riyadh</name>
         <coordinates>24.640833 46.772778</coordinates>
         <location>
           <name>Riyadh</name>
@@ -22837,7 +22837,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Tabuk</_name>
+        <name>Tabuk</name>
         <coordinates>28.383333 36.583333</coordinates>
         <location>
           <name>Tabuk</name>
@@ -22847,7 +22847,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Tamrah</_name>
+        <name>Tamrah</name>
         <coordinates>20.398333 45.415000</coordinates>
         <location>
           <name>Wadi Al Dawasser Airport</name>
@@ -22857,7 +22857,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Turayf</_name>
+        <name>Turayf</name>
         <coordinates>31.677500 38.653056</coordinates>
         <location>
           <name>Turayf</name>
@@ -22867,7 +22867,7 @@
       </city>
       <city>
         <!-- A city in Saudi Arabia -->
-        <_name>Yanbu' al Bahr</_name>
+        <name>Yanbu' al Bahr</name>
         <coordinates>24.085278 38.048611</coordinates>
         <location>
           <name>Yanbu' al Bahr</name>
@@ -22878,7 +22878,7 @@
     </country>
     <country>
       <!-- SY - Syrian Arab Republic -->
-      <_name>Syria</_name>
+      <name>Syria</name>
       <iso-code>SY</iso-code>
       <fips-code>SY</fips-code>
       <timezones>
@@ -22887,7 +22887,7 @@
       <tz-hint>Asia/Damascus</tz-hint>
       <city>
         <!-- A city in Syria -->
-        <_name>Al Qamishli</_name>
+        <name>Al Qamishli</name>
         <coordinates>37.049722 41.226389</coordinates>
         <location>
           <name>Al Qamishli</name>
@@ -22900,7 +22900,7 @@
              "Aleppo" is the traditional English name.
              The local name in Arabic is "Halab".
           -->
-        <_name>Aleppo</_name>
+        <name>Aleppo</name>
         <coordinates>36.202778 37.158611</coordinates>
         <location>
           <name>Aleppo International Airport</name>
@@ -22913,7 +22913,7 @@
              "Damascus" is the traditional English name.
              The local name in Arabic is "Dimashq".
           -->
-        <_name>Damascus</_name>
+        <name>Damascus</name>
         <coordinates>33.500000 36.300000</coordinates>
         <location>
           <name>Damascus International Airport</name>
@@ -22923,7 +22923,7 @@
       </city>
       <city>
         <!-- A city in Syria -->
-        <_name>Dayr az Zawr</_name>
+        <name>Dayr az Zawr</name>
         <coordinates>35.333333 40.150000</coordinates>
         <location>
           <name>Dayr az Zawr</name>
@@ -22936,7 +22936,7 @@
              "Latakia" is the traditional English name.
              The local name in Arabic is "Al Ladhiqiyah".
           -->
-        <_name>Latakia</_name>
+        <name>Latakia</name>
         <coordinates>35.516667 35.783333</coordinates>
         <location>
           <name>Latakia</name>
@@ -22947,7 +22947,7 @@
     </country>
     <country>
       <!-- AE - United Arab Emirates -->
-      <_name>United Arab Emirates</_name>
+      <name>United Arab Emirates</name>
       <iso-code>AE</iso-code>
       <fips-code>AE</fips-code>
       <timezones>
@@ -22959,7 +22959,7 @@
              "Abu Dhabi" is the traditional English name.
              The local name in Arabic is "Abu Zaby".
           -->
-        <_name>Abu Dhabi</_name>
+        <name>Abu Dhabi</name>
         <coordinates>24.466667 54.366667</coordinates>
         <location>
           <name>Abu Dhabi International Airport</name>
@@ -22969,7 +22969,7 @@
       </city>
       <city>
         <!-- A city in the United Arab Emirates -->
-        <_name>Al 'Ayn</_name>
+        <name>Al 'Ayn</name>
         <coordinates>24.216667 55.766667</coordinates>
         <location>
           <name>Al 'Ayn International Airport</name>
@@ -22979,7 +22979,7 @@
       </city>
       <city>
         <!-- A city in the United Arab Emirates -->
-        <_name>Al Fujayrah</_name>
+        <name>Al Fujayrah</name>
         <coordinates>25.123056 56.337500</coordinates>
         <location>
           <name>Al Fujayrah</name>
@@ -22992,7 +22992,7 @@
              "Dubai" is the traditional English name.
              The local name in Arabic is "Dubayy".
           -->
-        <_name>Dubai</_name>
+        <name>Dubai</name>
         <coordinates>25.252222 55.280000</coordinates>
         <location>
           <name>Dubai International Airport</name>
@@ -23002,7 +23002,7 @@
       </city>
       <city>
         <!-- A city in the United Arab Emirates -->
-        <_name>Ra's al Khaymah</_name>
+        <name>Ra's al Khaymah</name>
         <coordinates>25.791111 55.942778</coordinates>
         <location>
           <name>Ra's al Khaymah International Airport</name>
@@ -23015,7 +23015,7 @@
              "Sharjah" is the traditional English name.
              The local name in Arabic is "Ash Shariqah".
           -->
-        <_name>Sharjah</_name>
+        <name>Sharjah</name>
         <coordinates>25.362222 55.391111</coordinates>
         <location>
           <name>Sharjah International Airport</name>
@@ -23026,7 +23026,7 @@
     </country>
     <country>
       <!-- YE - Yemen -->
-      <_name>Yemen</_name>
+      <name>Yemen</name>
       <!-- Could not find information about the following stations,
            which may be in Yemen:
            OYAG OYAM OYAS OYDM OYIB OYMT OYRN OYSD 
@@ -23039,7 +23039,7 @@
       <tz-hint>Asia/Aden</tz-hint>
       <city>
         <!-- A city in Yemen -->
-        <_name>'Adan</_name>
+        <name>'Adan</name>
         <coordinates>12.779444 45.036667</coordinates>
         <location>
           <name>'Adan</name>
@@ -23049,7 +23049,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>'Ataq</_name>
+        <name>'Ataq</name>
         <coordinates>14.550000 46.800000</coordinates>
         <location>
           <name>'Ataq</name>
@@ -23059,7 +23059,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Al Hudaydah</_name>
+        <name>Al Hudaydah</name>
         <coordinates>14.797778 42.952222</coordinates>
         <location>
           <name>Hodeidah</name>
@@ -23069,7 +23069,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Ma'rib</_name>
+        <name>Ma'rib</name>
         <coordinates>15.416667 45.350000</coordinates>
         <location>
           <name>Ma'rib</name>
@@ -23079,7 +23079,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Mori</_name>
+        <name>Mori</name>
         <coordinates>12.633333 53.900000</coordinates>
         <location>
           <name>Socotra</name>
@@ -23089,7 +23089,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Sa'dah</_name>
+        <name>Sa'dah</name>
         <coordinates>16.935833 43.764444</coordinates>
         <location>
           <name>Sa'dah / Sa'dah</name>
@@ -23102,7 +23102,7 @@
              "Sanaa" is the traditional English name.
              The local name in Arabic is "San'a'".
           -->
-        <_name>Sanaa</_name>
+        <name>Sanaa</name>
         <coordinates>15.354722 44.206667</coordinates>
         <location>
           <name>Sanaa</name>
@@ -23112,7 +23112,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Say'un</_name>
+        <name>Say'un</name>
         <coordinates>15.943333 48.793333</coordinates>
         <location>
           <name>Say'un</name>
@@ -23122,7 +23122,7 @@
       </city>
       <city>
         <!-- A city in Yemen -->
-        <_name>Ta'izz</_name>
+        <name>Ta'izz</name>
         <coordinates>13.566667 44.033333</coordinates>
         <location>
           <name>Ta'izz</name>
@@ -23133,10 +23133,10 @@
     </country>
   </region>
   <region>
-    <_name>North America</_name>
+    <name>North America</name>
     <country>
       <!-- CA - Canada -->
-      <_name>Canada</_name>
+      <name>Canada</name>
       <!-- Could not find cities for the following weather stations:
            CYLA - Aupaluk (59.296667 -69.599722)
            CWWL - Bonilla Island Meteorological Aeronautical
@@ -23202,7 +23202,7 @@
                where "US", "Canada" or "Mexico" is already clear from
                the context.
             -->
-          <_name>Pacific Time</_name>
+          <name>Pacific Time</name>
           <obsoletes>America/Dawson</obsoletes>
           <obsoletes>America/Whitehorse</obsoletes>
         </timezone>
@@ -23214,7 +23214,7 @@
                string is only used in places where "US", "Canada" or
                "Mexico" is already clear from the context.
             -->
-          <_name>Mountain Time</_name>
+          <name>Mountain Time</name>
           <obsoletes>America/Cambridge_Bay</obsoletes>
           <obsoletes>America/Inuvik</obsoletes>
           <obsoletes>America/Yellowknife</obsoletes>
@@ -23225,7 +23225,7 @@
                is part of the "Mountain Time" zone, but does not
                observe Daylight Saving Time with the rest of the zone.
             -->
-          <_name>Mountain Time, no DST (Northeast BC)</_name>
+          <name>Mountain Time, no DST (Northeast BC)</name>
         </timezone>
         <timezone id="America/Winnipeg">
           <!-- The time zone used in the central-east part of North
@@ -23235,7 +23235,7 @@
                "US", "Canada" or "Mexico" is already clear from the
                context.
             -->
-          <_name>Central Time</_name>
+          <name>Central Time</name>
           <obsoletes>America/Rainy_River</obsoletes>
           <obsoletes>America/Rankin_Inlet</obsoletes>
         </timezone>
@@ -23245,7 +23245,7 @@
                zone, but does not observe Daylight Saving Time with the
                rest of the zone.
             -->
-          <_name>Central Time, no DST (Saskatchewan)</_name>
+          <name>Central Time, no DST (Saskatchewan)</name>
           <obsoletes>America/Swift_Current</obsoletes>
         </timezone>
         <timezone id="America/Toronto">
@@ -23255,7 +23255,7 @@
                "Heure de l'Est". The string is only used in places
                where "US" or "Canada" is already clear from the context.
             -->
-          <_name>Eastern Time</_name>
+          <name>Eastern Time</name>
           <obsoletes>America/Iqaluit</obsoletes>
           <obsoletes>America/Montreal</obsoletes>
           <obsoletes>America/Nipigon</obsoletes>
@@ -23269,7 +23269,7 @@
                which do not observe Daylight Saving Time with the rest
                of the zone.
             -->
-          <_name>Eastern Time, no DST (Southampton Island, etc)</_name>
+          <name>Eastern Time, no DST (Southampton Island, etc)</name>
           <obsoletes>America/Resolute</obsoletes>
         </timezone>
         <timezone id="America/Halifax">
@@ -23279,7 +23279,7 @@
                l'Atlantique". The string is only used in places where a
                country is already clear from the context.
             -->
-          <_name>Atlantic Time</_name>
+          <name>Atlantic Time</name>
           <obsoletes>America/Glace_Bay</obsoletes>
           <obsoletes>America/Goose_Bay</obsoletes>
           <obsoletes>America/Moncton</obsoletes>
@@ -23290,24 +23290,24 @@
                "Atlantic Time" zone, but does not observe Daylight
                Saving Time with the rest of the zone.
             -->
-          <_name>Atlantic Time, no DST (Eastern Quebec)</_name>
+          <name>Atlantic Time, no DST (Eastern Quebec)</name>
         </timezone>
         <timezone id="America/St_Johns">
           <!-- The time zone used in the Canadian province of
                Newfoundland. In French-speaking parts of Canada it is
                called "Heure de Terre-Neuve".
             -->
-          <_name>Newfoundland Time</_name>
+          <name>Newfoundland Time</name>
         </timezone>
       </timezones>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Alberta</_name>
+        <name>Alberta</name>
         <fips-code>CA01</fips-code>
         <tz-hint>America/Edmonton</tz-hint>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Banff</_name>
+          <name>Banff</name>
           <coordinates>51.166667 -115.566667</coordinates>
           <location>
             <name>Banff</name>
@@ -23322,7 +23322,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Bergen</_name>
+          <name>Bergen</name>
           <coordinates>51.700000 -114.633333</coordinates>
           <location>
             <name>Sundre</name>
@@ -23332,7 +23332,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Bow Island</_name>
+          <name>Bow Island</name>
           <coordinates>49.866667 -111.366667</coordinates>
           <location>
             <name>Bow Island</name>
@@ -23342,7 +23342,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Brooks</_name>
+          <name>Brooks</name>
           <coordinates>50.566667 -111.900000</coordinates>
           <location>
             <name>Brooks Automatic Weather Reporting System</name>
@@ -23352,7 +23352,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Calgary</_name>
+          <name>Calgary</name>
           <coordinates>51.083333 -114.083333</coordinates>
           <location>
             <name>Calgary International</name>
@@ -23367,7 +23367,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Cardston</_name>
+          <name>Cardston</name>
           <coordinates>49.200000 -113.316667</coordinates>
           <location>
             <name>Cardston Automated Reporting Station</name>
@@ -23377,7 +23377,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Claresholm</_name>
+          <name>Claresholm</name>
           <coordinates>50.033333 -113.583333</coordinates>
           <location>
             <name>Claresholm Automatic Weather Reporting System</name>
@@ -23387,7 +23387,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Cold Lake</_name>
+          <name>Cold Lake</name>
           <coordinates>54.465000 -110.183056</coordinates>
           <location>
             <name>Cold Lake</name>
@@ -23397,7 +23397,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Coleman</_name>
+          <name>Coleman</name>
           <coordinates>49.633333 -114.500000</coordinates>
           <location>
             <name>Crowsnest</name>
@@ -23407,7 +23407,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Coronation</_name>
+          <name>Coronation</name>
           <coordinates>52.083333 -111.450000</coordinates>
           <location>
             <name>Coronation Automated Reporting Station</name>
@@ -23417,7 +23417,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Drumheller</_name>
+          <name>Drumheller</name>
           <coordinates>51.466667 -112.700000</coordinates>
           <location>
             <name>Drumheller East</name>
@@ -23427,7 +23427,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Edmonton</_name>
+          <name>Edmonton</name>
           <coordinates>53.550000 -113.500000</coordinates>
           <location>
             <name>Edmonton Municipal</name>
@@ -23447,7 +23447,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Edson</_name>
+          <name>Edson</name>
           <coordinates>53.583333 -116.416667</coordinates>
           <location>
             <name>Edson</name>
@@ -23457,7 +23457,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Embarras Portage</_name>
+          <name>Embarras Portage</name>
           <coordinates>58.450000 -111.500000</coordinates>
           <location>
             <name>Prairie River</name>
@@ -23467,7 +23467,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Esther</_name>
+          <name>Esther</name>
           <coordinates>51.683333 -110.250000</coordinates>
           <location>
             <name>Esther</name>
@@ -23477,7 +23477,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Fort Chipewyan</_name>
+          <name>Fort Chipewyan</name>
           <coordinates>58.716667 -111.150000</coordinates>
           <location>
             <name>Fort Chipewyan</name>
@@ -23487,7 +23487,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Fort McMurray</_name>
+          <name>Fort McMurray</name>
           <coordinates>56.733333 -111.383333</coordinates>
           <location>
             <name>Fort McMurray</name>
@@ -23497,7 +23497,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Grande Prairie</_name>
+          <name>Grande Prairie</name>
           <coordinates>55.166667 -118.800000</coordinates>
           <location>
             <name>Grande Prairie</name>
@@ -23507,7 +23507,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>High Level</_name>
+          <name>High Level</name>
           <coordinates>58.516667 -117.133333</coordinates>
           <location>
             <name>High Level</name>
@@ -23517,7 +23517,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name msgctxt="City in Alberta, Canada">Jasper</_name>
+          <name msgctxt="City in Alberta, Canada">Jasper</name>
           <coordinates>52.883333 -118.083333</coordinates>
           <location>
             <name>Jasper Warden Automated Reporting Station</name>
@@ -23527,7 +23527,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Lac La Biche</_name>
+          <name>Lac La Biche</name>
           <coordinates>54.771944 -111.964722</coordinates>
           <location>
             <name>Lac La Biche</name>
@@ -23537,7 +23537,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Lethbridge</_name>
+          <name>Lethbridge</name>
           <coordinates>49.700000 -112.833333</coordinates>
           <location>
             <name>Lethbridge</name>
@@ -23547,7 +23547,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Medicine Hat</_name>
+          <name>Medicine Hat</name>
           <coordinates>50.033333 -110.683333</coordinates>
           <location>
             <name>Medicine Hat</name>
@@ -23557,7 +23557,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Milk River</_name>
+          <name>Milk River</name>
           <coordinates>49.133333 -112.083333</coordinates>
           <location>
             <name>Milk River</name>
@@ -23567,7 +23567,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Onefour</_name>
+          <name>Onefour</name>
           <coordinates>49.066667 -110.450000</coordinates>
           <location>
             <name>Onefour Automatic Weather Reporting System</name>
@@ -23577,7 +23577,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Peace River</_name>
+          <name>Peace River</name>
           <coordinates>56.233333 -117.283333</coordinates>
           <location>
             <name>Peace River</name>
@@ -23587,7 +23587,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Pincher Creek</_name>
+          <name>Pincher Creek</name>
           <coordinates>49.483333 -113.950000</coordinates>
           <location>
             <name>Pincher Creek Airport</name>
@@ -23597,7 +23597,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Red Deer</_name>
+          <name>Red Deer</name>
           <coordinates>52.266667 -113.800000</coordinates>
           <location>
             <name>Red Deer</name>
@@ -23607,7 +23607,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Rocky Mountain House</_name>
+          <name>Rocky Mountain House</name>
           <coordinates>52.366667 -114.916667</coordinates>
           <location>
             <name>Rocky House Marine Aviation Reporting Station</name>
@@ -23617,7 +23617,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Seebe</_name>
+          <name>Seebe</name>
           <coordinates>51.100000 -115.066667</coordinates>
           <location>
             <name>Bow Valley</name>
@@ -23627,7 +23627,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Slave Lake</_name>
+          <name>Slave Lake</name>
           <coordinates>55.283333 -114.783333</coordinates>
           <location>
             <name>Slave Lake</name>
@@ -23637,7 +23637,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Spirit River</_name>
+          <name>Spirit River</name>
           <coordinates>55.783333 -118.833333</coordinates>
           <location>
             <name>Spirit River Auto Station</name>
@@ -23647,7 +23647,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Three Hills</_name>
+          <name>Three Hills</name>
           <coordinates>51.700000 -113.266667</coordinates>
           <location>
             <name>Three Hills</name>
@@ -23657,7 +23657,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Vegreville</_name>
+          <name>Vegreville</name>
           <coordinates>53.500000 -112.050000</coordinates>
           <location>
             <name>Vegreville Automatic Weather Reporting System</name>
@@ -23667,7 +23667,7 @@
         </city>
         <city>
           <!-- A city in Alberta in Canada -->
-          <_name>Whitecourt</_name>
+          <name>Whitecourt</name>
           <coordinates>54.133333 -115.683333</coordinates>
           <location>
             <name>Whitecourt</name>
@@ -23678,12 +23678,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>British Columbia</_name>
+        <name>British Columbia</name>
         <fips-code>CA02</fips-code>
         <tz-hint>America/Vancouver</tz-hint>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Abbotsford</_name>
+          <name>Abbotsford</name>
           <coordinates>49.050000 -122.300000</coordinates>
           <location>
             <name>Abbotsford</name>
@@ -23693,7 +23693,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Agassiz</_name>
+          <name>Agassiz</name>
           <coordinates>49.233333 -121.766667</coordinates>
           <location>
             <name>Agassiz Automated Reporting Station</name>
@@ -23703,7 +23703,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Allison Harbour</_name>
+          <name>Allison Harbour</name>
           <coordinates>51.033333 -127.516667</coordinates>
           <location>
             <name>Herbert Island Meteorological Aeronautical Presentation System</name>
@@ -23713,7 +23713,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Alta Lake</_name>
+          <name>Alta Lake</name>
           <coordinates>50.116667 -122.983333</coordinates>
           <location>
             <name>Whistler</name>
@@ -23723,7 +23723,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Baldonnel</_name>
+          <name>Baldonnel</name>
           <coordinates>56.216667 -120.683333</coordinates>
           <location>
             <name>Fort St John</name>
@@ -23733,7 +23733,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Bella Coola</_name>
+          <name>Bella Coola</name>
           <coordinates>52.366667 -126.750000</coordinates>
           <location>
             <name>Bella Coola Airport</name>
@@ -23743,7 +23743,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Blue River</_name>
+          <name>Blue River</name>
           <coordinates>52.100000 -119.300000</coordinates>
           <location>
             <name>Blue River</name>
@@ -23753,7 +23753,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Boat Basin</_name>
+          <name>Boat Basin</name>
           <coordinates>49.483333 -126.400000</coordinates>
           <location>
             <name>Estevan Point</name>
@@ -23763,7 +23763,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Burns Lake</_name>
+          <name>Burns Lake</name>
           <coordinates>54.216667 -125.766667</coordinates>
           <location>
             <name>Burns Lake</name>
@@ -23773,7 +23773,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Campbell River</_name>
+          <name>Campbell River</name>
           <coordinates>50.016667 -125.250000</coordinates>
           <location>
             <name>Campbell River Airport</name>
@@ -23783,7 +23783,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Castlegar</_name>
+          <name>Castlegar</name>
           <coordinates>49.316667 -117.666667</coordinates>
           <location>
             <name>Castlegar Airport</name>
@@ -23793,7 +23793,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Clinton</_name>
+          <name msgctxt="City in British Columbia, Canada">Clinton</name>
           <coordinates>51.100000 -121.600000</coordinates>
           <location>
             <name>Clinton</name>
@@ -23803,7 +23803,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Comox</_name>
+          <name>Comox</name>
           <coordinates>49.683333 -124.933333</coordinates>
           <location>
             <name>Comox</name>
@@ -23813,7 +23813,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Cranbrook</_name>
+          <name>Cranbrook</name>
           <coordinates>49.516667 -115.766667</coordinates>
           <location>
             <name>Cranbrook</name>
@@ -23823,7 +23823,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Creston</_name>
+          <name msgctxt="City in British Columbia, Canada">Creston</name>
           <coordinates>49.100000 -116.516667</coordinates>
           <location>
             <name>Creston Automatic Weather Reporting System</name>
@@ -23833,7 +23833,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Dease Lake</_name>
+          <name>Dease Lake</name>
           <coordinates>58.450000 -130.033333</coordinates>
           <location>
             <name>Dease Lake Coastal Station</name>
@@ -23843,7 +23843,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Esquimalt</_name>
+          <name>Esquimalt</name>
           <coordinates>48.433333 -123.416667</coordinates>
           <location>
             <name>Esquimalt Harbour</name>
@@ -23853,7 +23853,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Fort Grahame</_name>
+          <name>Fort Grahame</name>
           <coordinates>56.600000 -124.633333</coordinates>
           <location>
             <name>Ingenika Point</name>
@@ -23863,7 +23863,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Fort Nelson</_name>
+          <name>Fort Nelson</name>
           <coordinates>58.816667 -122.533333</coordinates>
           <location>
             <name>Fort Nelson</name>
@@ -23873,7 +23873,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Gabriola</_name>
+          <name>Gabriola</name>
           <coordinates>49.183333 -123.850000</coordinates>
           <location>
             <name>Entrance Island Automatic Weather Reporting System</name>
@@ -23883,7 +23883,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Golden</_name>
+          <name>Golden</name>
           <coordinates>51.300000 -116.966667</coordinates>
           <location>
             <name>Golden Airport</name>
@@ -23893,7 +23893,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Hollyburn</_name>
+          <name>Hollyburn</name>
           <coordinates>49.333333 -123.166667</coordinates>
           <location>
             <name>W Vancouver Automatic Weather Reporting System</name>
@@ -23903,7 +23903,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Hope</_name>
+          <name>Hope</name>
           <coordinates>49.383333 -121.433333</coordinates>
           <location>
             <name>Hope</name>
@@ -23913,7 +23913,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Kamloops</_name>
+          <name>Kamloops</name>
           <coordinates>50.666667 -120.333333</coordinates>
           <location>
             <name>Kamloops</name>
@@ -23923,7 +23923,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Kelowna</_name>
+          <name>Kelowna</name>
           <coordinates>49.900000 -119.483333</coordinates>
           <location>
             <name>Kelowna Airport</name>
@@ -23933,7 +23933,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Lasqueti</_name>
+          <name>Lasqueti</name>
           <coordinates>49.483333 -124.350000</coordinates>
           <location>
             <name>Sisters Island Automatic Weather Reporting System</name>
@@ -23943,7 +23943,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Little Prairie</_name>
+          <name>Little Prairie</name>
           <coordinates>55.700000 -121.616667</coordinates>
           <location>
             <name>Chetwynd Airport</name>
@@ -23953,7 +23953,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Lytton</_name>
+          <name>Lytton</name>
           <coordinates>50.233333 -121.566667</coordinates>
           <location>
             <name>Lytton</name>
@@ -23963,7 +23963,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>McLeod Lake</_name>
+          <name>McLeod Lake</name>
           <coordinates>55.000000 -123.033333</coordinates>
           <location>
             <name>Mackenzie</name>
@@ -23973,7 +23973,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Nakusp</_name>
+          <name>Nakusp</name>
           <coordinates>50.233333 -117.800000</coordinates>
           <location>
             <name>Nakusp Automatic Weather Reporting System</name>
@@ -23983,7 +23983,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Nanaimo</_name>
+          <name>Nanaimo</name>
           <coordinates>49.150000 -123.916667</coordinates>
           <location>
             <name>Nanaimo Airport</name>
@@ -23993,7 +23993,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Nanoose Bay</_name>
+          <name>Nanoose Bay</name>
           <coordinates>49.250000 -124.183333</coordinates>
           <location>
             <name>Ballenas Island Automatic Weather Reporting System</name>
@@ -24003,7 +24003,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Natal</_name>
+          <name msgctxt="City in British Columbia, Canada">Natal</name>
           <coordinates>49.733333 -114.850000</coordinates>
           <location>
             <name>Sparwood, Sparwood-Elk Valley Airport</name>
@@ -24018,7 +24018,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Nelson</_name>
+          <name>Nelson</name>
           <coordinates>49.483333 -117.283333</coordinates>
           <location>
             <name>Nelson Automatic Weather Reporting System</name>
@@ -24028,7 +24028,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>North Kamloops</_name>
+          <name>North Kamloops</name>
           <coordinates>50.683333 -120.366667</coordinates>
           <location>
             <name>Princeton Automatic Weather Reporting System</name>
@@ -24038,7 +24038,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Ocean Falls</_name>
+          <name>Ocean Falls</name>
           <coordinates>52.350000 -127.700000</coordinates>
           <location>
             <name>Cathedral Point Meteorological Aeronautical Presentation System</name>
@@ -24048,7 +24048,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Osoyoos</_name>
+          <name>Osoyoos</name>
           <coordinates>49.033333 -119.466667</coordinates>
           <location>
             <name>Osoyoos Automatic Weather Reporting System</name>
@@ -24058,7 +24058,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Penticton</_name>
+          <name>Penticton</name>
           <coordinates>49.500000 -119.583333</coordinates>
           <location>
             <name>Penticton</name>
@@ -24068,7 +24068,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Pitt Meadows</_name>
+          <name>Pitt Meadows</name>
           <coordinates>49.233333 -122.683333</coordinates>
           <location>
             <name>P. Meadows Coastal Station Automatic Weather Reporting System</name>
@@ -24078,7 +24078,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Port Hardy</_name>
+          <name>Port Hardy</name>
           <coordinates>50.716667 -127.500000</coordinates>
           <location>
             <name>Port Hardy</name>
@@ -24088,7 +24088,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Port Simpson</_name>
+          <name>Port Simpson</name>
           <coordinates>54.550000 -130.416667</coordinates>
           <location>
             <name>Grey Islet Meteorological Aeronautical Presentation System</name>
@@ -24098,7 +24098,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Powell River</_name>
+          <name>Powell River</name>
           <coordinates>49.883333 -124.550000</coordinates>
           <location>
             <name>Powell River Airport</name>
@@ -24108,7 +24108,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Prince George</_name>
+          <name>Prince George</name>
           <coordinates>53.916667 -122.766667</coordinates>
           <location>
             <name>Prince George</name>
@@ -24118,7 +24118,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Prince Rupert</_name>
+          <name>Prince Rupert</name>
           <coordinates>54.316667 -130.333333</coordinates>
           <location>
             <name>Prince Rupert</name>
@@ -24128,7 +24128,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Princeton</_name>
+          <name msgctxt="City in British Columbia, Canada">Princeton</name>
           <coordinates>49.450000 -120.500000</coordinates>
           <location>
             <name>Princeton Airport</name>
@@ -24138,7 +24138,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Queen Charlotte</_name>
+          <name>Queen Charlotte</name>
           <coordinates>53.250000 -132.083333</coordinates>
           <location>
             <name>Kindakun Rocks</name>
@@ -24148,7 +24148,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Quesnel</_name>
+          <name>Quesnel</name>
           <coordinates>52.983333 -122.483333</coordinates>
           <location>
             <name>Quesnel Airport</name>
@@ -24158,7 +24158,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Revelstoke</_name>
+          <name>Revelstoke</name>
           <coordinates>51.000000 -118.183333</coordinates>
           <location>
             <name>Revelstoke</name>
@@ -24168,7 +24168,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Rocky Point</_name>
+          <name>Rocky Point</name>
           <coordinates>48.316667 -123.550000</coordinates>
           <location>
             <name>Race Rocks Automatic Weather Reporting System</name>
@@ -24178,7 +24178,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Salmon Arm</_name>
+          <name>Salmon Arm</name>
           <coordinates>50.700000 -119.283333</coordinates>
           <location>
             <name>Salmon Arm Automatic Weather Reporting System</name>
@@ -24188,7 +24188,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Sandspit</_name>
+          <name>Sandspit</name>
           <coordinates>53.250000 -131.833333</coordinates>
           <location>
             <name>Sandspit</name>
@@ -24198,7 +24198,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Smithers</_name>
+          <name>Smithers</name>
           <coordinates>54.766667 -127.166667</coordinates>
           <location>
             <name>Smithers</name>
@@ -24208,7 +24208,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Squamish</_name>
+          <name>Squamish</name>
           <coordinates>49.700000 -123.150000</coordinates>
           <location>
             <name>Squamish Airport</name>
@@ -24218,7 +24218,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Stephen</_name>
+          <name>Stephen</name>
           <coordinates>51.450000 -116.300000</coordinates>
           <location>
             <name>Yoho Park Automatic Weather Reporting System</name>
@@ -24228,7 +24228,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Steveston</_name>
+          <name>Steveston</name>
           <coordinates>49.133333 -123.183333</coordinates>
           <location>
             <name>Sand Heads</name>
@@ -24238,7 +24238,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Stewart</_name>
+          <name>Stewart</name>
           <coordinates>55.933333 -130.000000</coordinates>
           <location>
             <name>Stewart Airport</name>
@@ -24248,7 +24248,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Summerland</_name>
+          <name>Summerland</name>
           <coordinates>49.600000 -119.666667</coordinates>
           <location>
             <name>Summerland Automatic Weather Reporting System</name>
@@ -24258,7 +24258,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Terrace</_name>
+          <name>Terrace</name>
           <coordinates>54.500000 -128.583333</coordinates>
           <location>
             <name>Terrace</name>
@@ -24268,7 +24268,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Tofino</_name>
+          <name>Tofino</name>
           <coordinates>49.133333 -125.900000</coordinates>
           <location>
             <name>Tofino Airport</name>
@@ -24278,7 +24278,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Tow Hill</_name>
+          <name>Tow Hill</name>
           <coordinates>54.066667 -131.783333</coordinates>
           <location>
             <name>Rose Spit Meteorological Aeronautical Presentation System</name>
@@ -24288,7 +24288,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Trout Lake</_name>
+          <name>Trout Lake</name>
           <coordinates>53.816667 -89.883333</coordinates>
           <location>
             <name>Big Trout Lake</name>
@@ -24298,7 +24298,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Vancouver</_name>
+          <name msgctxt="City in British Columbia, Canada">Vancouver</name>
           <coordinates>49.250000 -123.133333</coordinates>
           <location>
             <name>Vancouver International Airport</name>
@@ -24308,7 +24308,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Vernon</_name>
+          <name msgctxt="City in British Columbia, Canada">Vernon</name>
           <coordinates>50.266667 -119.266667</coordinates>
           <location>
             <name>Vernon</name>
@@ -24318,7 +24318,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name msgctxt="City in British Columbia, Canada">Victoria</_name>
+          <name msgctxt="City in British Columbia, Canada">Victoria</name>
           <coordinates>48.433333 -123.350000</coordinates>
           <location>
             <name>Victoria Harbour</name>
@@ -24363,7 +24363,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>White Rock</_name>
+          <name>White Rock</name>
           <coordinates>49.033333 -122.816667</coordinates>
           <location>
             <name>White Rock Automatic Weather Reporting System</name>
@@ -24373,7 +24373,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Williams Lake</_name>
+          <name>Williams Lake</name>
           <coordinates>52.116667 -122.150000</coordinates>
           <location>
             <name>Williams Lake</name>
@@ -24383,7 +24383,7 @@
         </city>
         <city>
           <!-- A city in British Columbia in Canada -->
-          <_name>Winter Harbour</_name>
+          <name>Winter Harbour</name>
           <coordinates>50.516667 -128.033333</coordinates>
           <location>
             <name>Solander Island Meteorological Aeronautical Presentation System</name>
@@ -24394,12 +24394,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Manitoba</_name>
+        <name>Manitoba</name>
         <fips-code>CA03</fips-code>
         <tz-hint>America/Winnipeg</tz-hint>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Berens River</_name>
+          <name>Berens River</name>
           <coordinates>52.366667 -97.033333</coordinates>
           <location>
             <name>Berens River</name>
@@ -24409,7 +24409,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Brandon</_name>
+          <name>Brandon</name>
           <coordinates>49.833333 -99.950000</coordinates>
           <location>
             <name>Brandon</name>
@@ -24419,7 +24419,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Carman</_name>
+          <name>Carman</name>
           <coordinates>49.500000 -98.000000</coordinates>
           <location>
             <name>Carman U of M</name>
@@ -24429,7 +24429,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Churchill</_name>
+          <name>Churchill</name>
           <coordinates>58.766667 -94.166667</coordinates>
           <location>
             <name>Churchill</name>
@@ -24439,7 +24439,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Dauphin</_name>
+          <name>Dauphin</name>
           <coordinates>51.150000 -100.050000</coordinates>
           <location>
             <name>Dauphin</name>
@@ -24449,7 +24449,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Flin Flon</_name>
+          <name>Flin Flon</name>
           <coordinates>54.766667 -101.883333</coordinates>
           <location>
             <name>Flin Flon Airport</name>
@@ -24459,7 +24459,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Gillam</_name>
+          <name>Gillam</name>
           <coordinates>56.350000 -94.700000</coordinates>
           <location>
             <name>Gillam</name>
@@ -24474,7 +24474,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Gimli</_name>
+          <name>Gimli</name>
           <coordinates>50.633333 -97.000000</coordinates>
           <location>
             <name>Gimli Harbour</name>
@@ -24484,7 +24484,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name msgctxt="City in Manitoba, Canada">Grand Rapids</_name>
+          <name msgctxt="City in Manitoba, Canada">Grand Rapids</name>
           <coordinates>53.166667 -99.283333</coordinates>
           <location>
             <name>Grand Rapids</name>
@@ -24494,7 +24494,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Island Lake</_name>
+          <name>Island Lake</name>
           <coordinates>53.966667 -94.766667</coordinates>
           <location>
             <name>Island Lake</name>
@@ -24504,7 +24504,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Lynn Lake</_name>
+          <name>Lynn Lake</name>
           <coordinates>56.850000 -101.050000</coordinates>
           <location>
             <name>Lynn Lake</name>
@@ -24514,7 +24514,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name msgctxt="City in Manitoba, Canada">Miami</_name>
+          <name msgctxt="City in Manitoba, Canada">Miami</name>
           <coordinates>49.366667 -98.250000</coordinates>
           <location>
             <name>Deerwood</name>
@@ -24524,7 +24524,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Morden</_name>
+          <name>Morden</name>
           <coordinates>49.183333 -98.100000</coordinates>
           <location>
             <name>Morden</name>
@@ -24534,7 +24534,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Norway House</_name>
+          <name>Norway House</name>
           <coordinates>53.966667 -97.833333</coordinates>
           <location>
             <name>Norway House</name>
@@ -24544,7 +24544,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Pilot Mound</_name>
+          <name>Pilot Mound</name>
           <coordinates>49.200000 -98.900000</coordinates>
           <location>
             <name>Pilot Mound</name>
@@ -24554,7 +24554,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Swan River</_name>
+          <name>Swan River</name>
           <coordinates>52.100000 -101.266667</coordinates>
           <location>
             <name>Swan River</name>
@@ -24564,7 +24564,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>The Pas</_name>
+          <name>The Pas</name>
           <coordinates>53.816667 -101.233333</coordinates>
           <location>
             <name>The Pas</name>
@@ -24574,7 +24574,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Thompson</_name>
+          <name>Thompson</name>
           <coordinates>55.750000 -97.866667</coordinates>
           <location>
             <name>Thompson Weather Office</name>
@@ -24584,7 +24584,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Victoria Beach</_name>
+          <name>Victoria Beach</name>
           <coordinates>50.700000 -96.550000</coordinates>
           <location>
             <name>Victoria Beach</name>
@@ -24594,7 +24594,7 @@
         </city>
         <city>
           <!-- A city in Manitoba in Canada -->
-          <_name>Winnipeg</_name>
+          <name>Winnipeg</name>
           <coordinates>49.883333 -97.166667</coordinates>
           <location>
             <name>Winnipeg International Airportman.</name>
@@ -24605,12 +24605,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>New Brunswick</_name>
+        <name>New Brunswick</name>
         <fips-code>CA04</fips-code>
         <tz-hint>America/Halifax</tz-hint>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Bathurst</_name>
+          <name>Bathurst</name>
           <coordinates>47.600000 -65.650000</coordinates>
           <location>
             <name>Bathurst Airport</name>
@@ -24620,7 +24620,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Dipper Harbour</_name>
+          <name>Dipper Harbour</name>
           <coordinates>45.083333 -66.416667</coordinates>
           <location>
             <name>Point Lepreau</name>
@@ -24630,7 +24630,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Fredericton</_name>
+          <name>Fredericton</name>
           <coordinates>45.950000 -66.633333</coordinates>
           <location>
             <name>Fredericton</name>
@@ -24640,7 +24640,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Gagetown</_name>
+          <name>Gagetown</name>
           <coordinates>45.766667 -66.150000</coordinates>
           <location>
             <name>Gagetown Can-Mil</name>
@@ -24650,7 +24650,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Moncton</_name>
+          <name>Moncton</name>
           <coordinates>46.083333 -64.766667</coordinates>
           <location>
             <name>Moncton</name>
@@ -24660,7 +24660,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Saint John</_name>
+          <name>Saint John</name>
           <coordinates>45.266667 -66.066667</coordinates>
           <location>
             <name>Saint John</name>
@@ -24670,7 +24670,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Saint Leonard</_name>
+          <name>Saint Leonard</name>
           <coordinates>47.166667 -67.916667</coordinates>
           <location>
             <name>Saint Leonard Airport</name>
@@ -24685,7 +24685,7 @@
         </city>
         <city>
           <!-- A city in New Brunswick in Canada -->
-          <_name>Saint Stephen</_name>
+          <name>Saint Stephen</name>
           <coordinates>45.200000 -67.266667</coordinates>
           <location>
             <name>St. Stephen</name>
@@ -24696,12 +24696,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Newfoundland and Labrador</_name>
+        <name>Newfoundland and Labrador</name>
         <fips-code>CA05</fips-code>
         <tz-hint>America/St_Johns</tz-hint>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Argentia</_name>
+          <name>Argentia</name>
           <coordinates>47.300000 -54.000000</coordinates>
           <location>
             <name>Argentia</name>
@@ -24711,7 +24711,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Cape Race</_name>
+          <name>Cape Race</name>
           <coordinates>46.666667 -53.083333</coordinates>
           <location>
             <name>Cape Race</name>
@@ -24721,7 +24721,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Cartwright</_name>
+          <name>Cartwright</name>
           <coordinates>53.700000 -57.016667</coordinates>
           <location>
             <name>Cartwright</name>
@@ -24731,7 +24731,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Deer Lake</_name>
+          <name>Deer Lake</name>
           <coordinates>49.183333 -57.433333</coordinates>
           <location>
             <name>Deer Lake</name>
@@ -24741,7 +24741,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Englee</_name>
+          <name>Englee</name>
           <coordinates>50.733333 -56.100000</coordinates>
           <location>
             <name>Englee Meteorological Aeronautical Presentation System</name>
@@ -24751,7 +24751,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Ferolle Point</_name>
+          <name>Ferolle Point</name>
           <coordinates>51.016667 -57.100000</coordinates>
           <location>
             <name>Ferolle Point Meteorological Aeronautical Presentation System</name>
@@ -24761,7 +24761,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Gander</_name>
+          <name>Gander</name>
           <coordinates>48.950000 -54.550000</coordinates>
           <location>
             <name>Gander International Airport</name>
@@ -24771,7 +24771,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Goose Bay</_name>
+          <name>Goose Bay</name>
           <coordinates>53.333333 -60.416667</coordinates>
           <location>
             <name>Goose Bay</name>
@@ -24781,7 +24781,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Harbour Breton</_name>
+          <name>Harbour Breton</name>
           <coordinates>47.483333 -55.833333</coordinates>
           <location>
             <name>Sagona Island Meteorological Aeronautical Presentation System</name>
@@ -24791,7 +24791,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name msgctxt="City in Newfoundland and Labrador, Canada">Hebron</_name>
+          <name msgctxt="City in Newfoundland and Labrador, Canada">Hebron</name>
           <coordinates>58.200000 -62.633333</coordinates>
           <location>
             <name>Saglek Bay</name>
@@ -24801,7 +24801,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Hopedale</_name>
+          <name>Hopedale</name>
           <coordinates>55.450000 -60.216667</coordinates>
           <location>
             <name>Hopedale Meteorological Aeronautical Presentation System</name>
@@ -24811,7 +24811,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Makkovik</_name>
+          <name>Makkovik</name>
           <coordinates>55.083333 -59.183333</coordinates>
           <location>
             <name>Makkovik Airport</name>
@@ -24821,7 +24821,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Mary's Harbour</_name>
+          <name>Mary's Harbour</name>
           <coordinates>52.300000 -55.833333</coordinates>
           <location>
             <name>Mary's Harbour</name>
@@ -24831,7 +24831,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Mount Pearl Park</_name>
+          <name>Mount Pearl Park</name>
           <coordinates>47.516667 -52.783333</coordinates>
           <location>
             <name>St. John's West</name>
@@ -24841,7 +24841,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Nain</_name>
+          <name>Nain</name>
           <coordinates>56.550000 -61.683333</coordinates>
           <location>
             <name>Nain</name>
@@ -24851,7 +24851,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Neddy Harbour</_name>
+          <name>Neddy Harbour</name>
           <coordinates>49.533333 -57.866667</coordinates>
           <location>
             <name>Rocky Harbour</name>
@@ -24861,7 +24861,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Nutak</_name>
+          <name>Nutak</name>
           <coordinates>57.466667 -61.833333</coordinates>
           <location>
             <name>Cape Kiglapait</name>
@@ -24871,7 +24871,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Saint Anthony</_name>
+          <name>Saint Anthony</name>
           <coordinates>51.383333 -55.600000</coordinates>
           <location>
             <name>Saint Anthony Airport</name>
@@ -24881,7 +24881,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name msgctxt="City in Newfoundland and Labrador, Canada">Saint John's</_name>
+          <name msgctxt="City in Newfoundland and Labrador, Canada">Saint John's</name>
           <coordinates>47.550000 -52.666667</coordinates>
           <location>
             <name>St. John's</name>
@@ -24891,7 +24891,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name msgctxt="City in Newfoundland and Labrador, Canada">Stephenville</_name>
+          <name msgctxt="City in Newfoundland and Labrador, Canada">Stephenville</name>
           <coordinates>48.550000 -58.566667</coordinates>
           <location>
             <name>Stephenville</name>
@@ -24901,7 +24901,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Terra Nova</_name>
+          <name>Terra Nova</name>
           <coordinates>48.500000 -54.216667</coordinates>
           <location>
             <name>Terra Nova National Park</name>
@@ -24911,7 +24911,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Twillingate</_name>
+          <name>Twillingate</name>
           <coordinates>49.650000 -54.750000</coordinates>
           <location>
             <name>Twillingate Meteorological Aeronautical Presentation System</name>
@@ -24921,7 +24921,7 @@
         </city>
         <city>
           <!-- A city in Newfoundland and Labrador in Canada -->
-          <_name>Wabush</_name>
+          <name>Wabush</name>
           <coordinates>52.916667 -66.866667</coordinates>
           <location>
             <name>Wabush Lake</name>
@@ -24932,12 +24932,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Northwest Territories</_name>
+        <name>Northwest Territories</name>
         <fips-code>CA13</fips-code>
         <tz-hint>America/Edmonton</tz-hint>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Aklavik</_name>
+          <name>Aklavik</name>
           <coordinates>68.216667 -135.000000</coordinates>
           <location>
             <name>Aklavik Airport</name>
@@ -24947,7 +24947,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Cape Parry</_name>
+          <name>Cape Parry</name>
           <coordinates>70.166667 -124.666667</coordinates>
           <location>
             <name>Cape Parry</name>
@@ -24957,7 +24957,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Délįne</_name>
+          <name>Délįne</name>
           <coordinates>65.183333 -123.416667</coordinates>
           <location>
             <name>Délįne Airport</name>
@@ -24967,7 +24967,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Fort Good Hope</_name>
+          <name>Fort Good Hope</name>
           <coordinates>66.266667 -128.633333</coordinates>
           <location>
             <name>Fort Good Hope Airport</name>
@@ -24977,7 +24977,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Fort Providence</_name>
+          <name>Fort Providence</name>
           <coordinates>61.366667 -117.650000</coordinates>
           <location>
             <name>Fort Providence</name>
@@ -24987,7 +24987,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Fort Simpson</_name>
+          <name>Fort Simpson</name>
           <coordinates>61.850000 -121.333333</coordinates>
           <location>
             <name>Fort Simpson</name>
@@ -24997,7 +24997,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name msgctxt="City in Northwest Territories, Canada">Fort Smith</_name>
+          <name msgctxt="City in Northwest Territories, Canada">Fort Smith</name>
           <coordinates>60.000000 -111.883333</coordinates>
           <location>
             <name>Fort Smith</name>
@@ -25007,7 +25007,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Hay River</_name>
+          <name>Hay River</name>
           <coordinates>60.850000 -115.700000</coordinates>
           <location>
             <name>Hay River</name>
@@ -25017,7 +25017,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Holman</_name>
+          <name>Holman</name>
           <coordinates>70.733333 -117.750000</coordinates>
           <location>
             <name>Holman Airport</name>
@@ -25027,7 +25027,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Inuvik</_name>
+          <name>Inuvik</name>
           <coordinates>68.350000 -133.700000</coordinates>
           <location>
             <name>Inuvik</name>
@@ -25037,7 +25037,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Nahanni Butte</_name>
+          <name>Nahanni Butte</name>
           <coordinates>61.050000 -123.366667</coordinates>
           <location>
             <name>Lindberg Landing</name>
@@ -25047,7 +25047,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Norman Wells</_name>
+          <name>Norman Wells</name>
           <coordinates>65.283333 -126.850000</coordinates>
           <location>
             <name>Norman Wells</name>
@@ -25057,7 +25057,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Paulatuk</_name>
+          <name>Paulatuk</name>
           <coordinates>69.383333 -123.983333</coordinates>
           <location>
             <name>Paulatuk Airport</name>
@@ -25067,7 +25067,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Sachs Harbour</_name>
+          <name>Sachs Harbour</name>
           <coordinates>71.983333 -125.200000</coordinates>
           <location>
             <name>Sachs Harbour Airport</name>
@@ -25077,7 +25077,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Tuktoyaktuk</_name>
+          <name>Tuktoyaktuk</name>
           <coordinates>69.450000 -133.066667</coordinates>
           <location>
             <name>Tuktoyaktuk</name>
@@ -25087,7 +25087,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Tununuk</_name>
+          <name>Tununuk</name>
           <coordinates>69.000000 -134.666667</coordinates>
           <location>
             <name>Storm Hills</name>
@@ -25097,7 +25097,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Wha Ti</_name>
+          <name>Wha Ti</name>
           <coordinates>63.133333 -117.266667</coordinates>
           <location>
             <name>Wha Ti</name>
@@ -25107,7 +25107,7 @@
         </city>
         <city>
           <!-- A city in Northwest Territories in Canada -->
-          <_name>Yellowknife</_name>
+          <name>Yellowknife</name>
           <coordinates>62.450000 -114.350000</coordinates>
           <location>
             <name>Yellowknife</name>
@@ -25118,12 +25118,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Nova Scotia</_name>
+        <name>Nova Scotia</name>
         <fips-code>CA07</fips-code>
         <tz-hint>America/Halifax</tz-hint>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Bay Saint Lawrence</_name>
+          <name>Bay Saint Lawrence</name>
           <coordinates>47.000000 -60.466667</coordinates>
           <location>
             <name>Saint Paul Island Meteorological Aeronautical Presentation System</name>
@@ -25133,7 +25133,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Beaver Harbour</_name>
+          <name>Beaver Harbour</name>
           <coordinates>44.900000 -62.416667</coordinates>
           <location>
             <name>Beaven Island</name>
@@ -25143,7 +25143,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Caledonia</_name>
+          <name>Caledonia</name>
           <coordinates>44.366667 -65.033333</coordinates>
           <location>
             <name>Kejimkujik</name>
@@ -25153,7 +25153,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Canso</_name>
+          <name>Canso</name>
           <coordinates>45.350000 -61.000000</coordinates>
           <location>
             <name>Hart Island Meteorological Aeronautical Presentation System</name>
@@ -25163,7 +25163,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Caribou Island</_name>
+          <name>Caribou Island</name>
           <coordinates>45.750000 -62.733333</coordinates>
           <location>
             <name>Caribou Point Meteorological Aeronautical Presentation System</name>
@@ -25173,7 +25173,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Chéticamp</_name>
+          <name>Chéticamp</name>
           <coordinates>46.616667 -61.016667</coordinates>
           <location>
             <name>Chéticamp</name>
@@ -25183,7 +25183,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Dingwall</_name>
+          <name>Dingwall</name>
           <coordinates>46.900000 -60.466667</coordinates>
           <location>
             <name>North Mountain</name>
@@ -25193,7 +25193,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Grand-Etang</_name>
+          <name>Grand-Etang</name>
           <coordinates>46.550000 -61.033333</coordinates>
           <location>
             <name>Grand-Etang</name>
@@ -25203,7 +25203,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name msgctxt="City in Nova Scotia, Canada">Greenwood</_name>
+          <name msgctxt="City in Nova Scotia, Canada">Greenwood</name>
           <coordinates>44.983333 -64.900000</coordinates>
           <location>
             <name>Greenwood</name>
@@ -25213,7 +25213,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Halifax</_name>
+          <name>Halifax</name>
           <coordinates>44.650000 -63.600000</coordinates>
           <location>
             <name>Halifax International Airport</name>
@@ -25223,7 +25223,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Kentville</_name>
+          <name>Kentville</name>
           <coordinates>45.066667 -64.500000</coordinates>
           <location>
             <name>Kentville</name>
@@ -25233,7 +25233,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name msgctxt="City in Nova Scotia, Canada">Liverpool</_name>
+          <name msgctxt="City in Nova Scotia, Canada">Liverpool</name>
           <coordinates>44.033333 -64.716667</coordinates>
           <location>
             <name>Western Head</name>
@@ -25243,7 +25243,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Sheet Harbour</_name>
+          <name>Sheet Harbour</name>
           <coordinates>44.933333 -62.533333</coordinates>
           <location>
             <name>Malay Falls</name>
@@ -25253,7 +25253,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name msgctxt="City in Nova Scotia, Canada">Sydney</_name>
+          <name msgctxt="City in Nova Scotia, Canada">Sydney</name>
           <coordinates>46.150000 -60.166667</coordinates>
           <location>
             <name>Sydney</name>
@@ -25263,7 +25263,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Westport</_name>
+          <name>Westport</name>
           <coordinates>44.266667 -66.350000</coordinates>
           <location>
             <name>Brier Island</name>
@@ -25273,7 +25273,7 @@
         </city>
         <city>
           <!-- A city in Nova Scotia in Canada -->
-          <_name>Yarmouth</_name>
+          <name>Yarmouth</name>
           <coordinates>43.833333 -66.116667</coordinates>
           <location>
             <name>Yarmouth</name>
@@ -25284,12 +25284,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Nunavut</_name>
+        <name>Nunavut</name>
         <fips-code>CA14</fips-code>
         <tz-hint>America/Toronto</tz-hint>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Arviat</_name>
+          <name>Arviat</name>
           <coordinates>61.116667 -94.050000</coordinates>
           <location>
             <name>Arviat Airport</name>
@@ -25299,7 +25299,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Baker Lake</_name>
+          <name>Baker Lake</name>
           <coordinates>64.316667 -96.016667</coordinates>
           <location>
             <name>Baker Lake</name>
@@ -25309,7 +25309,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Cambridge Bay</_name>
+          <name>Cambridge Bay</name>
           <coordinates>69.116667 -105.033333</coordinates>
           <location>
             <name>Cambridge Bay</name>
@@ -25319,7 +25319,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Cape Dorset</_name>
+          <name>Cape Dorset</name>
           <coordinates>64.233333 -76.550000</coordinates>
           <location>
             <name>Cape Dorset</name>
@@ -25329,7 +25329,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Cape Dyer</_name>
+          <name>Cape Dyer</name>
           <coordinates>66.666667 -61.366667</coordinates>
           <location>
             <name>Cape Dyer</name>
@@ -25339,7 +25339,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Chesterfield Inlet</_name>
+          <name>Chesterfield Inlet</name>
           <coordinates>63.333333 -90.700000</coordinates>
           <location>
             <name>Chesterfield Inlet</name>
@@ -25349,7 +25349,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Clyde River</_name>
+          <name>Clyde River</name>
           <coordinates>70.450000 -68.566667</coordinates>
           <location>
             <name>Clyde River</name>
@@ -25359,7 +25359,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Coral Harbour</_name>
+          <name>Coral Harbour</name>
           <coordinates>64.133333 -83.166667</coordinates>
           <location>
             <name>Coral Harbour</name>
@@ -25369,7 +25369,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Ennadai</_name>
+          <name>Ennadai</name>
           <coordinates>61.133333 -100.883333</coordinates>
           <location>
             <name>Ennadai Lake Meteorological Aeronautical Presentation System</name>
@@ -25379,7 +25379,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name msgctxt="City in Nunavut, Canada">Eureka</_name>
+          <name msgctxt="City in Nunavut, Canada">Eureka</name>
           <coordinates>80.216667 -86.183333</coordinates>
           <location>
             <name>Eureka</name>
@@ -25389,7 +25389,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Gjoa Haven</_name>
+          <name>Gjoa Haven</name>
           <coordinates>68.633333 -95.916667</coordinates>
           <location>
             <name>Gjoa Haven Airport</name>
@@ -25399,7 +25399,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Hall Beach</_name>
+          <name>Hall Beach</name>
           <coordinates>68.766667 -81.200000</coordinates>
           <location>
             <name>Hall Beach</name>
@@ -25409,7 +25409,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Igloolik</_name>
+          <name>Igloolik</name>
           <coordinates>69.400000 -81.800000</coordinates>
           <location>
             <name>Igloolik Airport</name>
@@ -25419,7 +25419,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Iqaluit</_name>
+          <name>Iqaluit</name>
           <coordinates>63.733333 -68.500000</coordinates>
           <location>
             <name>Iqaluit</name>
@@ -25429,7 +25429,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Kugaaruk</_name>
+          <name>Kugaaruk</name>
           <coordinates>68.533333 -89.816667</coordinates>
           <location>
             <name>Kugaaruk Airport</name>
@@ -25439,7 +25439,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Kugluktuk</_name>
+          <name>Kugluktuk</name>
           <coordinates>67.833333 -115.083333</coordinates>
           <location>
             <name>Kugluktuk</name>
@@ -25449,7 +25449,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Pangnirtung</_name>
+          <name>Pangnirtung</name>
           <coordinates>66.133333 -65.750000</coordinates>
           <location>
             <name>Pangnirtung Airport</name>
@@ -25459,7 +25459,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Pond Inlet</_name>
+          <name>Pond Inlet</name>
           <coordinates>72.700000 -78.000000</coordinates>
           <location>
             <name>Pond Inlet</name>
@@ -25469,7 +25469,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Qikiqtarjuaq</_name>
+          <name>Qikiqtarjuaq</name>
           <coordinates>67.550000 -64.033333</coordinates>
           <location>
             <name>Qikiqtarjuaq Airport</name>
@@ -25484,7 +25484,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Rankin Inlet</_name>
+          <name>Rankin Inlet</name>
           <coordinates>62.816667 -92.083333</coordinates>
           <location>
             <name>Rankin Inlet</name>
@@ -25494,7 +25494,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Repulse Bay</_name>
+          <name>Repulse Bay</name>
           <coordinates>66.516667 -86.233333</coordinates>
           <location>
             <name>Repulse Bay Airport</name>
@@ -25504,7 +25504,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Resolute</_name>
+          <name>Resolute</name>
           <coordinates>74.683333 -94.900000</coordinates>
           <location>
             <name>Resolute</name>
@@ -25514,7 +25514,7 @@
         </city>
         <city>
           <!-- A city in Nunavut in Canada -->
-          <_name>Taloyoak</_name>
+          <name>Taloyoak</name>
           <coordinates>69.533333 -93.533333</coordinates>
           <location>
             <name>Taloyoak Airport</name>
@@ -25525,12 +25525,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name msgctxt="State in Canada">Ontario</_name>
+        <name msgctxt="State in Canada">Ontario</name>
         <fips-code>CA08</fips-code>
         <tz-hint>America/Toronto</tz-hint>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Bancroft</_name>
+          <name>Bancroft</name>
           <coordinates>45.050000 -77.850000</coordinates>
           <location>
             <name>Bancroft Automatic Weather Reporting System</name>
@@ -25540,7 +25540,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Beardmore</_name>
+          <name>Beardmore</name>
           <coordinates>49.600000 -87.950000</coordinates>
           <location>
             <name>Katatota Island</name>
@@ -25550,7 +25550,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Borden</_name>
+          <name>Borden</name>
           <coordinates>44.283333 -79.916667</coordinates>
           <location>
             <name>Borden</name>
@@ -25560,7 +25560,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Burlington</_name>
+          <name msgctxt="City in Ontario, Canada">Burlington</name>
           <coordinates>43.316667 -79.800000</coordinates>
           <location>
             <name>Burlington Piers</name>
@@ -25570,7 +25570,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Central Patricia</_name>
+          <name>Central Patricia</name>
           <coordinates>51.483333 -90.150000</coordinates>
           <location>
             <name>Pickle Lake</name>
@@ -25580,7 +25580,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Chapleau</_name>
+          <name>Chapleau</name>
           <coordinates>47.833333 -83.400000</coordinates>
           <location>
             <name>Chapleau</name>
@@ -25590,7 +25590,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Cobourg</_name>
+          <name>Cobourg</name>
           <coordinates>43.966667 -78.166667</coordinates>
           <location>
             <name>Cobourg</name>
@@ -25600,7 +25600,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Collingwood</_name>
+          <name>Collingwood</name>
           <coordinates>44.500000 -80.216667</coordinates>
           <location>
             <name>Collingwood Automatic Weather Reporting System</name>
@@ -25610,7 +25610,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Coppell</_name>
+          <name>Coppell</name>
           <coordinates>49.533333 -83.833333</coordinates>
           <location>
             <name>Nagagami</name>
@@ -25620,7 +25620,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Delhi</_name>
+          <name>Delhi</name>
           <coordinates>42.850000 -80.500000</coordinates>
           <location>
             <name>Delhi</name>
@@ -25630,7 +25630,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Dryden</_name>
+          <name msgctxt="City in Ontario, Canada">Dryden</name>
           <coordinates>49.783333 -92.833333</coordinates>
           <location>
             <name>Dryden Airport</name>
@@ -25640,7 +25640,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Earlton</_name>
+          <name>Earlton</name>
           <coordinates>47.716667 -79.816667</coordinates>
           <location>
             <name>Earlton</name>
@@ -25650,7 +25650,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Elliot Lake</_name>
+          <name>Elliot Lake</name>
           <coordinates>46.383333 -82.650000</coordinates>
           <location>
             <name>Elliot Lake Supplementary Aviation Weather Reporting Station</name>
@@ -25660,7 +25660,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Erieau</_name>
+          <name>Erieau</name>
           <coordinates>42.250000 -81.916667</coordinates>
           <location>
             <name>Erieau Meteorological Aeronautical Presentation System</name>
@@ -25670,7 +25670,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Front of Escott</_name>
+          <name>Front of Escott</name>
           <coordinates>44.433333 -75.950000</coordinates>
           <location>
             <name>Grenadier Island</name>
@@ -25680,7 +25680,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Geraldton</_name>
+          <name>Geraldton</name>
           <coordinates>49.716667 -86.966667</coordinates>
           <location>
             <name>Geraldton</name>
@@ -25690,7 +25690,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Goderich</_name>
+          <name>Goderich</name>
           <coordinates>43.733333 -81.700000</coordinates>
           <location>
             <name>Goderich Automatic Weather Reporting System</name>
@@ -25700,7 +25700,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Gore Bay</_name>
+          <name>Gore Bay</name>
           <coordinates>45.916667 -82.466667</coordinates>
           <location>
             <name>Gore Bay</name>
@@ -25710,7 +25710,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Hallowell</_name>
+          <name>Hallowell</name>
           <coordinates>44.000000 -77.233333</coordinates>
           <location>
             <name>Point Petre</name>
@@ -25720,7 +25720,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Hamilton</_name>
+          <name msgctxt="City in Ontario, Canada">Hamilton</name>
           <coordinates>43.250000 -79.833333</coordinates>
           <location>
             <name>Hamilton Airport</name>
@@ -25730,7 +25730,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Heron Bay</_name>
+          <name>Heron Bay</name>
           <coordinates>48.650000 -86.283333</coordinates>
           <location>
             <name>Pukaskwa</name>
@@ -25740,7 +25740,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Kapuskasing</_name>
+          <name>Kapuskasing</name>
           <coordinates>49.416667 -82.433333</coordinates>
           <location>
             <name>Kapuskasing</name>
@@ -25750,7 +25750,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Kenora</_name>
+          <name>Kenora</name>
           <coordinates>49.766667 -94.466667</coordinates>
           <location>
             <name>Kenora</name>
@@ -25760,7 +25760,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Kingston</_name>
+          <name msgctxt="City in Ontario, Canada">Kingston</name>
           <coordinates>44.233333 -76.483333</coordinates>
           <location>
             <name>Kingston</name>
@@ -25771,7 +25771,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">London</_name>
+          <name msgctxt="City in Ontario, Canada">London</name>
           <coordinates>42.983333 -81.250000</coordinates>
           <location>
             <name>London</name>
@@ -25781,7 +25781,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Moosonee</_name>
+          <name>Moosonee</name>
           <coordinates>51.266667 -80.650000</coordinates>
           <location>
             <name>Moosonee</name>
@@ -25791,7 +25791,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Mount Forest</_name>
+          <name>Mount Forest</name>
           <coordinates>43.966667 -80.733333</coordinates>
           <location>
             <name>Mount Forest</name>
@@ -25801,7 +25801,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Muskoka Falls</_name>
+          <name>Muskoka Falls</name>
           <coordinates>45.000000 -79.300000</coordinates>
           <location>
             <name>Muskoka Falls</name>
@@ -25811,7 +25811,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Nanticoke</_name>
+          <name>Nanticoke</name>
           <coordinates>42.800000 -80.066667</coordinates>
           <location>
             <name>Long Point Meteorological Aeronautical Presentation System</name>
@@ -25821,7 +25821,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>North Bay</_name>
+          <name>North Bay</name>
           <coordinates>46.300000 -79.450000</coordinates>
           <location>
             <name>North Bay</name>
@@ -25831,7 +25831,7 @@
         </city>
         <city>
           <!-- The capital of Canada -->
-          <_name>Ottawa</_name>
+          <name>Ottawa</name>
           <coordinates>45.416667 -75.700000</coordinates>
           <location>
             <name>Ottawa International</name>
@@ -25842,7 +25842,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Petawawa</_name>
+          <name>Petawawa</name>
           <coordinates>45.900000 -77.283333</coordinates>
           <location>
             <name>Petawawa</name>
@@ -25852,7 +25852,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Peterborough</_name>
+          <name>Peterborough</name>
           <coordinates>44.300000 -78.333333</coordinates>
           <location>
             <name>Peterborough Airport</name>
@@ -25862,7 +25862,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Port Weller</_name>
+          <name>Port Weller</name>
           <coordinates>43.216667 -79.216667</coordinates>
           <location>
             <name>Port Weller</name>
@@ -25872,7 +25872,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Red Lake</_name>
+          <name>Red Lake</name>
           <coordinates>51.033333 -93.833333</coordinates>
           <location>
             <name>Red Lake</name>
@@ -25882,7 +25882,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Saint Catharines</_name>
+          <name>Saint Catharines</name>
           <coordinates>43.166667 -79.233333</coordinates>
           <location>
             <name>Saint Catharines Airport</name>
@@ -25892,7 +25892,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Sarnia</_name>
+          <name>Sarnia</name>
           <coordinates>42.966667 -82.400000</coordinates>
           <location>
             <name>Sarnia Airport</name>
@@ -25902,7 +25902,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Sault Sainte Marie</_name>
+          <name>Sault Sainte Marie</name>
           <coordinates>46.500000 -84.333333</coordinates>
           <location>
             <name>Sault Ste Marie</name>
@@ -25912,7 +25912,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Sioux Lookout</_name>
+          <name>Sioux Lookout</name>
           <coordinates>50.100000 -91.916667</coordinates>
           <location>
             <name>Sioux Lookout</name>
@@ -25922,7 +25922,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Sudbury</_name>
+          <name>Sudbury</name>
           <coordinates>46.500000 -80.966667</coordinates>
           <location>
             <name>Sudbury</name>
@@ -25932,7 +25932,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Thunder Bay</_name>
+          <name>Thunder Bay</name>
           <coordinates>48.400000 -89.233333</coordinates>
           <location>
             <name>Thunder Bay</name>
@@ -25942,7 +25942,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Timmins</_name>
+          <name>Timmins</name>
           <coordinates>48.466667 -81.333333</coordinates>
           <location>
             <name>Timmins</name>
@@ -25952,7 +25952,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Tobermory</_name>
+          <name>Tobermory</name>
           <coordinates>45.250000 -81.666667</coordinates>
           <location>
             <name>Cove Island Meteorological Aeronautical Presentation System</name>
@@ -25962,7 +25962,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Toronto</_name>
+          <name>Toronto</name>
           <coordinates>43.666667 -79.416667</coordinates>
           <location>
             <name>Toronto Island Airport</name>
@@ -25984,7 +25984,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Trenton</_name>
+          <name msgctxt="City in Ontario, Canada">Trenton</name>
           <coordinates>44.100000 -77.583333</coordinates>
           <location>
             <name>Trenton</name>
@@ -25995,7 +25995,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Upsala</_name>
+          <name>Upsala</name>
           <coordinates>49.050000 -90.466667</coordinates>
           <location>
             <name>Upsala</name>
@@ -26005,7 +26005,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name msgctxt="City in Ontario, Canada">Waterloo</_name>
+          <name msgctxt="City in Ontario, Canada">Waterloo</name>
           <coordinates>43.466667 -80.533333</coordinates>
           <location>
             <name>Waterloo Well</name>
@@ -26015,7 +26015,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Wawa</_name>
+          <name>Wawa</name>
           <coordinates>48.000000 -84.783333</coordinates>
           <location>
             <name>Wawa</name>
@@ -26025,7 +26025,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Whitefish Falls</_name>
+          <name>Whitefish Falls</name>
           <coordinates>46.100000 -81.716667</coordinates>
           <location>
             <name>Killarney Meteorological Aeronautical Presentation System</name>
@@ -26035,7 +26035,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Wiarton</_name>
+          <name>Wiarton</name>
           <coordinates>44.733333 -81.133333</coordinates>
           <location>
             <name>Wiarton</name>
@@ -26045,7 +26045,7 @@
         </city>
         <city>
           <!-- A city in Ontario in Canada -->
-          <_name>Windsor</_name>
+          <name>Windsor</name>
           <coordinates>42.333333 -83.033333</coordinates>
           <location>
             <name>Windsor</name>
@@ -26056,12 +26056,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Prince Edward Island</_name>
+        <name>Prince Edward Island</name>
         <fips-code>CA09</fips-code>
         <tz-hint>America/Halifax</tz-hint>
         <city>
           <!-- A city in Prince Edward Island in Canada -->
-          <_name>Charlottetown</_name>
+          <name>Charlottetown</name>
           <coordinates>46.233333 -63.133333</coordinates>
           <location>
             <name>Charlottetown</name>
@@ -26071,7 +26071,7 @@
         </city>
         <city>
           <!-- A city in Prince Edward Island in Canada -->
-          <_name msgctxt="City in Prince Edward Island, Canada">Elmira</_name>
+          <name msgctxt="City in Prince Edward Island, Canada">Elmira</name>
           <coordinates>46.433333 -62.066667</coordinates>
           <location>
             <name>East Point</name>
@@ -26081,7 +26081,7 @@
         </city>
         <city>
           <!-- A city in Prince Edward Island in Canada -->
-          <_name>Summerside</_name>
+          <name>Summerside</name>
           <coordinates>46.400000 -63.783333</coordinates>
           <location>
             <name>Summerside Automatic Weather Reporting System</name>
@@ -26091,7 +26091,7 @@
         </city>
         <city>
           <!-- A city in Prince Edward Island in Canada -->
-          <_name>Tignish</_name>
+          <name>Tignish</name>
           <coordinates>46.950000 -64.033333</coordinates>
           <location>
             <name>North Point</name>
@@ -26102,12 +26102,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name msgctxt="State in Canada">Quebec</_name>
+        <name msgctxt="State in Canada">Quebec</name>
         <fips-code>CA10</fips-code>
         <tz-hint>America/Toronto</tz-hint>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Amqui</_name>
+          <name>Amqui</name>
           <coordinates>48.466667 -67.433333</coordinates>
           <location>
             <name>Amqui</name>
@@ -26117,7 +26117,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Bagotville</_name>
+          <name>Bagotville</name>
           <coordinates>48.350000 -70.883333</coordinates>
           <location>
             <name>Bagotville</name>
@@ -26127,7 +26127,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Baie-Comeau</_name>
+          <name>Baie-Comeau</name>
           <coordinates>49.216667 -68.150000</coordinates>
           <location>
             <name>Baie-Comeau</name>
@@ -26137,7 +26137,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Baie-Sainte-Catherine</_name>
+          <name>Baie-Sainte-Catherine</name>
           <coordinates>48.100000 -69.733333</coordinates>
           <location>
             <name>Ile Rouge Meteorological Aeronautical Presentation System</name>
@@ -26147,7 +26147,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Baie-de-la-Trinité</_name>
+          <name>Baie-de-la-Trinité</name>
           <coordinates>49.416667 -67.316667</coordinates>
           <location>
             <name>Pointe-Des-Monts</name>
@@ -26157,7 +26157,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Beauceville</_name>
+          <name>Beauceville</name>
           <coordinates>46.200000 -70.766667</coordinates>
           <location>
             <name>Beauceville</name>
@@ -26167,7 +26167,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Beauport</_name>
+          <name>Beauport</name>
           <coordinates>46.850000 -71.183333</coordinates>
           <location>
             <name>Beauport</name>
@@ -26177,7 +26177,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name msgctxt="City in Quebec, Canada">Bedford</_name>
+          <name msgctxt="City in Quebec, Canada">Bedford</name>
           <coordinates>45.116667 -72.983333</coordinates>
           <location>
             <name>Frelighsburg</name>
@@ -26187,7 +26187,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Bellin</_name>
+          <name>Bellin</name>
           <coordinates>60.016667 -70.033333</coordinates>
           <location>
             <name>Kangirsuk Supplementary Aviation Weather Reporting Station</name>
@@ -26197,7 +26197,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Blanc-Sablon</_name>
+          <name>Blanc-Sablon</name>
           <coordinates>51.433333 -57.116667</coordinates>
           <location>
             <name>Blanc-Sablon</name>
@@ -26207,7 +26207,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Canton-Bégin</_name>
+          <name>Canton-Bégin</name>
           <coordinates>48.683333 -71.366667</coordinates>
           <location>
             <name>Onatchiway</name>
@@ -26217,7 +26217,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Cap-Chat</_name>
+          <name>Cap-Chat</name>
           <coordinates>49.083333 -66.683333</coordinates>
           <location>
             <name>Cap-Chat</name>
@@ -26227,7 +26227,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Cap-aux-Meules</_name>
+          <name>Cap-aux-Meules</name>
           <coordinates>47.383333 -61.866667</coordinates>
           <location>
             <name>Iles-De-La-Madelein</name>
@@ -26242,7 +26242,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Cape Cove</_name>
+          <name>Cape Cove</name>
           <coordinates>48.433333 -64.333333</coordinates>
           <location>
             <name>Cap d'Espoir</name>
@@ -26252,7 +26252,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Chibougamau</_name>
+          <name>Chibougamau</name>
           <coordinates>49.866667 -74.350000</coordinates>
           <location>
             <name>Chibougamau-Chapais</name>
@@ -26262,7 +26262,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Fort-Rupert</_name>
+          <name>Fort-Rupert</name>
           <coordinates>51.483333 -78.766667</coordinates>
           <location>
             <name>Waskaganish Airport</name>
@@ -26272,7 +26272,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Gaspé</_name>
+          <name>Gaspé</name>
           <coordinates>48.833333 -64.483333</coordinates>
           <location>
             <name>Gaspé</name>
@@ -26282,7 +26282,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Gatineau</_name>
+          <name>Gatineau</name>
           <coordinates>45.483333 -75.650000</coordinates>
           <location>
             <name>Gatineau Airport</name>
@@ -26292,7 +26292,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Harrington Harbour</_name>
+          <name>Harrington Harbour</name>
           <coordinates>50.516667 -59.483333</coordinates>
           <location>
             <name>Chevery</name>
@@ -26302,7 +26302,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Havre-Saint-Pierre</_name>
+          <name>Havre-Saint-Pierre</name>
           <coordinates>50.250000 -63.583333</coordinates>
           <location>
             <name>Havre St Pierre</name>
@@ -26312,7 +26312,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Inoucdjouac</_name>
+          <name>Inoucdjouac</name>
           <coordinates>58.450000 -78.150000</coordinates>
           <location>
             <name>Inukjuak Airport</name>
@@ -26322,7 +26322,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Ivugivik</_name>
+          <name>Ivugivik</name>
           <coordinates>62.416667 -77.900000</coordinates>
           <location>
             <name>Ivujivik Airport</name>
@@ -26332,7 +26332,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Jacques-Cartier</_name>
+          <name>Jacques-Cartier</name>
           <coordinates>45.533333 -73.483333</coordinates>
           <location>
             <name>Saint Hubert Airport</name>
@@ -26343,7 +26343,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Jonquière</_name>
+          <name>Jonquière</name>
           <coordinates>48.416667 -71.250000</coordinates>
           <location>
             <name>Jonquiere Automated Reporting Station</name>
@@ -26353,7 +26353,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Koartac</_name>
+          <name>Koartac</name>
           <coordinates>61.033333 -69.616667</coordinates>
           <location>
             <name>Quaqtaq Airport</name>
@@ -26363,7 +26363,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Kuujjuaq</_name>
+          <name>Kuujjuaq</name>
           <coordinates>58.100000 -68.400000</coordinates>
           <location>
             <name>Kuujjuaq</name>
@@ -26373,7 +26373,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>L'Anse-Saint-Jean</_name>
+          <name>L'Anse-Saint-Jean</name>
           <coordinates>48.233333 -70.183333</coordinates>
           <location>
             <name>Puinte Claveau</name>
@@ -26383,7 +26383,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>L'Ascension</_name>
+          <name>L'Ascension</name>
           <coordinates>48.683333 -71.666667</coordinates>
           <location>
             <name>Mistook Automated Reporting Station</name>
@@ -26393,7 +26393,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>L'Assomption</_name>
+          <name>L'Assomption</name>
           <coordinates>45.816667 -73.433333</coordinates>
           <location>
             <name>L'Assomption</name>
@@ -26403,7 +26403,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>La Baie</_name>
+          <name>La Baie</name>
           <coordinates>48.333333 -70.866667</coordinates>
           <location>
             <name>La Baie</name>
@@ -26413,7 +26413,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>La Tuque</_name>
+          <name>La Tuque</name>
           <coordinates>47.450000 -72.783333</coordinates>
           <location>
             <name>La Tuque</name>
@@ -26423,7 +26423,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Leaf River</_name>
+          <name>Leaf River</name>
           <coordinates>58.766667 -69.116667</coordinates>
           <location>
             <name>Tasiujaq A</name>
@@ -26433,7 +26433,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Lennoxville</_name>
+          <name>Lennoxville</name>
           <coordinates>45.366667 -71.866667</coordinates>
           <location>
             <name>Lennoxville</name>
@@ -26443,7 +26443,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Longue-Pointe-de-Mingan</_name>
+          <name>Longue-Pointe-de-Mingan</name>
           <coordinates>50.266667 -64.150000</coordinates>
           <location>
             <name>Longue Point de Mingan</name>
@@ -26458,7 +26458,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Maniwaki</_name>
+          <name>Maniwaki</name>
           <coordinates>46.366667 -75.966667</coordinates>
           <location>
             <name>Maniwaki</name>
@@ -26468,7 +26468,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Maricourt</_name>
+          <name>Maricourt</name>
           <coordinates>61.600000 -71.950000</coordinates>
           <location>
             <name>Kangiqsujuaq Supplementary Aviation Weather Reporting Station</name>
@@ -26478,7 +26478,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Matagami</_name>
+          <name>Matagami</name>
           <coordinates>49.750000 -77.633333</coordinates>
           <location>
             <name>Matagami</name>
@@ -26488,7 +26488,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Mont-Apica</_name>
+          <name>Mont-Apica</name>
           <coordinates>47.983333 -71.433333</coordinates>
           <location>
             <name>Parc des Laurentid</name>
@@ -26498,7 +26498,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Mont-Joli</_name>
+          <name>Mont-Joli</name>
           <coordinates>48.583333 -68.183333</coordinates>
           <location>
             <name>Mont-Joli</name>
@@ -26508,7 +26508,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Montmagny</_name>
+          <name>Montmagny</name>
           <coordinates>46.966667 -70.550000</coordinates>
           <location>
             <name>Ile Aux Grues</name>
@@ -26520,7 +26520,7 @@
           <!-- A city in Quebec in Canada.
                The local name in French is "Montréal".
             -->
-          <_name>Montreal</_name>
+          <name>Montreal</name>
           <coordinates>45.466667 -73.750000</coordinates>
           <location>
             <name>McTavish Automated Reporting Station</name>
@@ -26542,7 +26542,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Natashquan</_name>
+          <name>Natashquan</name>
           <coordinates>50.183333 -61.816667</coordinates>
           <location>
             <name>Natashquan</name>
@@ -26552,7 +26552,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>New Carlisle</_name>
+          <name>New Carlisle</name>
           <coordinates>48.000000 -65.333333</coordinates>
           <location>
             <name>New Carlisle</name>
@@ -26562,7 +26562,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Nicolet</_name>
+          <name>Nicolet</name>
           <coordinates>46.216667 -72.600000</coordinates>
           <location>
             <name>Nicolet Automatic Weather Reporting System</name>
@@ -26572,7 +26572,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Normandin</_name>
+          <name>Normandin</name>
           <coordinates>48.833333 -72.516667</coordinates>
           <location>
             <name>Normandin</name>
@@ -26582,7 +26582,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Notre-Dame-de-la-Salette</_name>
+          <name>Notre-Dame-de-la-Salette</name>
           <coordinates>45.766667 -75.583333</coordinates>
           <location>
             <name>High Falls</name>
@@ -26592,7 +26592,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Nouveau-Comptoir</_name>
+          <name>Nouveau-Comptoir</name>
           <coordinates>53.000000 -78.816667</coordinates>
           <location>
             <name>Wemindji Airport</name>
@@ -26602,7 +26602,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Parent</_name>
+          <name>Parent</name>
           <coordinates>47.916667 -74.616667</coordinates>
           <location>
             <name>Parent</name>
@@ -26612,7 +26612,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Petite-Rivière</_name>
+          <name>Petite-Rivière</name>
           <coordinates>47.316667 -70.566667</coordinates>
           <location>
             <name>Charlevoix</name>
@@ -26622,7 +26622,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Port-Menier</_name>
+          <name>Port-Menier</name>
           <coordinates>49.816667 -64.350000</coordinates>
           <location>
             <name>Port-Menier</name>
@@ -26632,7 +26632,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Portneuf</_name>
+          <name>Portneuf</name>
           <coordinates>46.683333 -71.883333</coordinates>
           <location>
             <name>Deschambaults</name>
@@ -26642,7 +26642,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Poste-de-la-Baleine</_name>
+          <name>Poste-de-la-Baleine</name>
           <coordinates>55.266667 -77.783333</coordinates>
           <location>
             <name>Kuujjuarapik</name>
@@ -26652,7 +26652,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Puvirnituq</_name>
+          <name>Puvirnituq</name>
           <coordinates>60.033333 -77.283333</coordinates>
           <location>
             <name>Povungnituq</name>
@@ -26664,7 +26664,7 @@
           <!-- A city in Quebec in Canada.
                The local name in French is "Québec".
             -->
-          <_name msgctxt="City in Quebec, Canada">Quebec</_name>
+          <name msgctxt="City in Quebec, Canada">Quebec</name>
           <coordinates>46.800000 -71.250000</coordinates>
           <location>
             <name>Quebec</name>
@@ -26674,7 +26674,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Radisson</_name>
+          <name>Radisson</name>
           <coordinates>53.783333 -77.616667</coordinates>
           <location>
             <name>La Grande Riviere</name>
@@ -26684,7 +26684,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Rivière-du-Loup</_name>
+          <name>Rivière-du-Loup</name>
           <coordinates>47.833333 -69.533333</coordinates>
           <location>
             <name>Rivière-du-Loup</name>
@@ -26694,7 +26694,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Rivière-la-Madeleine</_name>
+          <name>Rivière-la-Madeleine</name>
           <coordinates>49.233333 -65.316667</coordinates>
           <location>
             <name>Cap Madeleine Meteorological Aeronautical Presentation System</name>
@@ -26704,7 +26704,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Roberval</_name>
+          <name>Roberval</name>
           <coordinates>48.516667 -72.216667</coordinates>
           <location>
             <name>Roberval</name>
@@ -26714,7 +26714,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Rouyn</_name>
+          <name>Rouyn</name>
           <coordinates>48.250000 -79.033333</coordinates>
           <location>
             <name>Rouyn Airport</name>
@@ -26724,7 +26724,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Anicet</_name>
+          <name>Saint-Anicet</name>
           <coordinates>45.133333 -74.350000</coordinates>
           <location>
             <name>St Anicet</name>
@@ -26734,7 +26734,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Chrysostome</_name>
+          <name>Saint-Chrysostome</name>
           <coordinates>45.100000 -73.750000</coordinates>
           <location>
             <name>Saint Clothilde Automated Reporting Station</name>
@@ -26744,7 +26744,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Fabien</_name>
+          <name>Saint-Fabien</name>
           <coordinates>48.283333 -68.866667</coordinates>
           <location>
             <name>Ile Bicquette</name>
@@ -26754,7 +26754,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-François</_name>
+          <name>Saint-François</name>
           <coordinates>47.000000 -70.816667</coordinates>
           <location>
             <name>Ile d'Orleans Automated Reporting Station</name>
@@ -26764,7 +26764,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Henri-de-Taillon</_name>
+          <name>Saint-Henri-de-Taillon</name>
           <coordinates>48.666667 -71.816667</coordinates>
           <location>
             <name>Saint Henri</name>
@@ -26774,7 +26774,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Jean</_name>
+          <name>Saint-Jean</name>
           <coordinates>45.300000 -73.250000</coordinates>
           <location>
             <name>L'Acadie</name>
@@ -26784,7 +26784,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Joachim</_name>
+          <name>Saint-Joachim</name>
           <coordinates>47.050000 -70.850000</coordinates>
           <location>
             <name>Cap Tourmente</name>
@@ -26794,7 +26794,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Saint-Jovite</_name>
+          <name>Saint-Jovite</name>
           <coordinates>46.116667 -74.583333</coordinates>
           <location>
             <name>St Jovite Automatic Weather Reporting System</name>
@@ -26804,7 +26804,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Sainte-Anne-de-la-Pocatière</_name>
+          <name>Sainte-Anne-de-la-Pocatière</name>
           <coordinates>47.366667 -70.033333</coordinates>
           <location>
             <name>La Pocatiere</name>
@@ -26814,7 +26814,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Schefferville</_name>
+          <name>Schefferville</name>
           <coordinates>54.800000 -66.816667</coordinates>
           <location>
             <name>Schefferville</name>
@@ -26824,7 +26824,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Senneville</_name>
+          <name>Senneville</name>
           <coordinates>45.433333 -73.966667</coordinates>
           <location>
             <name>Ste Anne de Bell</name>
@@ -26834,7 +26834,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Sept-Îles</_name>
+          <name>Sept-Îles</name>
           <coordinates>50.200000 -66.383333</coordinates>
           <location>
             <name>Pointe Noire</name>
@@ -26849,7 +26849,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Shawinigan</_name>
+          <name>Shawinigan</name>
           <coordinates>46.550000 -72.733333</coordinates>
           <location>
             <name>Shawinigan</name>
@@ -26859,7 +26859,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Sherbrooke</_name>
+          <name>Sherbrooke</name>
           <coordinates>45.400000 -71.900000</coordinates>
           <location>
             <name>Sherbrooke</name>
@@ -26869,7 +26869,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Stoneham</_name>
+          <name>Stoneham</name>
           <coordinates>46.983333 -71.366667</coordinates>
           <location>
             <name>Ste Foy</name>
@@ -26879,7 +26879,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Trois-Rivières</_name>
+          <name>Trois-Rivières</name>
           <coordinates>46.350000 -72.550000</coordinates>
           <location>
             <name>Trois-Rivières</name>
@@ -26889,7 +26889,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Val-d'Or</_name>
+          <name>Val-d'Or</name>
           <coordinates>48.116667 -77.766667</coordinates>
           <location>
             <name>Val-d'Or</name>
@@ -26899,7 +26899,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Valcartier Station</_name>
+          <name>Valcartier Station</name>
           <coordinates>46.883333 -71.516667</coordinates>
           <location>
             <name>Valcartier Airport</name>
@@ -26909,7 +26909,7 @@
         </city>
         <city>
           <!-- A city in Quebec in Canada -->
-          <_name>Varennes</_name>
+          <name>Varennes</name>
           <coordinates>45.683333 -73.433333</coordinates>
           <location>
             <name>Varennes</name>
@@ -26920,12 +26920,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Canada -->
-        <_name>Saskatchewan</_name>
+        <name>Saskatchewan</name>
         <fips-code>CA11</fips-code>
         <tz-hint>America/Regina</tz-hint>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Assiniboia</_name>
+          <name>Assiniboia</name>
           <coordinates>49.616667 -105.983333</coordinates>
           <location>
             <name>Assiniboia Airport</name>
@@ -26935,7 +26935,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Broadview</_name>
+          <name>Broadview</name>
           <coordinates>50.383333 -102.566667</coordinates>
           <location>
             <name>Broadview</name>
@@ -26945,7 +26945,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Buffalo Narrows</_name>
+          <name>Buffalo Narrows</name>
           <coordinates>55.854167 -108.484167</coordinates>
           <location>
             <name>Buffalo Narrows</name>
@@ -26960,7 +26960,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>East Poplar</_name>
+          <name>East Poplar</name>
           <coordinates>49.066667 -105.383333</coordinates>
           <location>
             <name>Coronach Spc</name>
@@ -26970,7 +26970,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Eastend</_name>
+          <name>Eastend</name>
           <coordinates>49.516667 -108.816667</coordinates>
           <location>
             <name>Eastend Cypress</name>
@@ -26980,7 +26980,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Estevan</_name>
+          <name>Estevan</name>
           <coordinates>49.150000 -103.000000</coordinates>
           <location>
             <name>Estevan</name>
@@ -26990,7 +26990,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Kindersley</_name>
+          <name>Kindersley</name>
           <coordinates>51.466667 -109.133333</coordinates>
           <location>
             <name>Kindersley</name>
@@ -27000,7 +27000,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>La Ronge</_name>
+          <name>La Ronge</name>
           <coordinates>55.100000 -105.300000</coordinates>
           <location>
             <name>La Ronge</name>
@@ -27010,7 +27010,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Leader</_name>
+          <name>Leader</name>
           <coordinates>50.883333 -109.550000</coordinates>
           <location>
             <name>Leader Airport, Automatic Weather Reporting System</name>
@@ -27020,7 +27020,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Lloydminster</_name>
+          <name>Lloydminster</name>
           <coordinates>53.283333 -110.000000</coordinates>
           <location>
             <name>Lloydminister</name>
@@ -27030,7 +27030,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Lucky Lake</_name>
+          <name>Lucky Lake</name>
           <coordinates>50.983333 -107.133333</coordinates>
           <location>
             <name>Lucky Lake Automatic Weather Reporting System</name>
@@ -27040,7 +27040,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Maple Creek</_name>
+          <name>Maple Creek</name>
           <coordinates>49.916667 -109.466667</coordinates>
           <location>
             <name>Maplecreek Automatic Weather Reporting System</name>
@@ -27055,7 +27055,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Meadow Lake</_name>
+          <name>Meadow Lake</name>
           <coordinates>54.129722 -108.434722</coordinates>
           <location>
             <name>Meadow Lake</name>
@@ -27065,7 +27065,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Melfort</_name>
+          <name>Melfort</name>
           <coordinates>52.866667 -104.600000</coordinates>
           <location>
             <name>Melfort Automatic Weather Reporting System</name>
@@ -27075,7 +27075,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Nipawin</_name>
+          <name>Nipawin</name>
           <coordinates>53.366667 -104.016667</coordinates>
           <location>
             <name>Nipawin</name>
@@ -27085,7 +27085,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>North Battleford</_name>
+          <name>North Battleford</name>
           <coordinates>52.766667 -108.283333</coordinates>
           <location>
             <name>North Battleford</name>
@@ -27095,7 +27095,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Prince Albert</_name>
+          <name>Prince Albert</name>
           <coordinates>53.200000 -105.750000</coordinates>
           <location>
             <name>Prince Albert</name>
@@ -27105,7 +27105,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Regina</_name>
+          <name>Regina</name>
           <coordinates>50.450000 -104.616667</coordinates>
           <location>
             <name>Regina</name>
@@ -27125,7 +27125,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Rockglen</_name>
+          <name>Rockglen</name>
           <coordinates>49.183333 -105.950000</coordinates>
           <location>
             <name>Rockglen</name>
@@ -27135,7 +27135,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Rosetown</_name>
+          <name>Rosetown</name>
           <coordinates>51.550000 -107.983333</coordinates>
           <location>
             <name>Rosetown East</name>
@@ -27145,7 +27145,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Saskatoon</_name>
+          <name>Saskatoon</name>
           <coordinates>52.133333 -106.666667</coordinates>
           <location>
             <name>Saskatoon</name>
@@ -27155,7 +27155,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name msgctxt="City in Saskatchewan, Canada">Southend</_name>
+          <name msgctxt="City in Saskatchewan, Canada">Southend</name>
           <coordinates>56.333333 -103.233333</coordinates>
           <location>
             <name>Southend Automatic Weather Reporting System</name>
@@ -27165,7 +27165,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Spiritwood</_name>
+          <name>Spiritwood</name>
           <coordinates>53.366667 -107.516667</coordinates>
           <location>
             <name>Spiritwood West</name>
@@ -27175,7 +27175,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Stony Rapids</_name>
+          <name>Stony Rapids</name>
           <coordinates>59.266667 -105.833333</coordinates>
           <location>
             <name>Stony Rapids Airport</name>
@@ -27185,7 +27185,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Swift Current</_name>
+          <name>Swift Current</name>
           <coordinates>50.283333 -107.766667</coordinates>
           <location>
             <name>Swift Current</name>
@@ -27195,7 +27195,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Uranium City</_name>
+          <name>Uranium City</name>
           <coordinates>59.566667 -108.616667</coordinates>
           <location>
             <name>Uranium City</name>
@@ -27205,7 +27205,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Val Marie</_name>
+          <name>Val Marie</name>
           <coordinates>49.233333 -107.733333</coordinates>
           <location>
             <name>Val Marie Southeast</name>
@@ -27215,7 +27215,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Watrous</_name>
+          <name>Watrous</name>
           <coordinates>51.666667 -105.466667</coordinates>
           <location>
             <name>Watrous East Automated Reporting Station</name>
@@ -27225,7 +27225,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Weyburn</_name>
+          <name>Weyburn</name>
           <coordinates>49.666667 -103.850000</coordinates>
           <location>
             <name>Weyburn Automatic Weather Reporting System</name>
@@ -27235,7 +27235,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Wynyard</_name>
+          <name>Wynyard</name>
           <coordinates>51.766667 -104.183333</coordinates>
           <location>
             <name>Wynyard Marine Aviation Reporting Station</name>
@@ -27245,7 +27245,7 @@
         </city>
         <city>
           <!-- A city in Saskatchewan in Canada -->
-          <_name>Yorkton</_name>
+          <name>Yorkton</name>
           <coordinates>51.216667 -102.466667</coordinates>
           <location>
             <name>Yorkton</name>
@@ -27256,12 +27256,12 @@
       </state>
       <state>
         <!-- FIXME: rename this to Yukon -->
-        <_name>Yukon Territory</_name>
+        <name>Yukon Territory</name>
         <fips-code>CA12</fips-code>
         <tz-hint>America/Vancouver</tz-hint>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Burwash Landing</_name>
+          <name>Burwash Landing</name>
           <coordinates>61.350000 -139.000000</coordinates>
           <location>
             <name>Burwash Landing Airport</name>
@@ -27271,7 +27271,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Carmacks</_name>
+          <name>Carmacks</name>
           <coordinates>62.100000 -136.316667</coordinates>
           <location>
             <name>Carmacks</name>
@@ -27281,7 +27281,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Dawson</_name>
+          <name>Dawson</name>
           <coordinates>64.066667 -139.416667</coordinates>
           <location>
             <name>Dawson</name>
@@ -27291,7 +27291,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Haines Junction</_name>
+          <name>Haines Junction</name>
           <coordinates>60.750000 -137.500000</coordinates>
           <location>
             <name>Haines Junction</name>
@@ -27301,7 +27301,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Mayo</_name>
+          <name>Mayo</name>
           <coordinates>63.600000 -135.916667</coordinates>
           <location>
             <name>Mayo Airport</name>
@@ -27311,7 +27311,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Old Crow</_name>
+          <name>Old Crow</name>
           <coordinates>67.566667 -139.800000</coordinates>
           <location>
             <name>Old Crow Airport</name>
@@ -27321,7 +27321,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Shingle Point</_name>
+          <name>Shingle Point</name>
           <coordinates>69.000000 -137.366667</coordinates>
           <location>
             <name>Shingle Point</name>
@@ -27331,7 +27331,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Snag</_name>
+          <name>Snag</name>
           <coordinates>62.383333 -140.366667</coordinates>
           <location>
             <name>Beaver Creek Airport</name>
@@ -27341,7 +27341,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Teslin</_name>
+          <name>Teslin</name>
           <coordinates>60.166667 -132.700000</coordinates>
           <location>
             <name>Teslin</name>
@@ -27356,7 +27356,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Watson Lake</_name>
+          <name>Watson Lake</name>
           <coordinates>60.116667 -128.800000</coordinates>
           <location>
             <name>Watson Lake</name>
@@ -27366,7 +27366,7 @@
         </city>
         <city>
           <!-- A city in Yukon Territory in Canada -->
-          <_name>Whitehorse</_name>
+          <name>Whitehorse</name>
           <coordinates>60.716667 -135.050000</coordinates>
           <location>
             <name>Whitehorse</name>
@@ -27378,7 +27378,7 @@
     </country>
     <country>
       <!-- MX - Mexico -->
-      <_name>Mexico</_name>
+      <name>Mexico</name>
       <!-- Could not find information about the following stations,
            which may be in Mexico:
            MMTB 
@@ -27387,15 +27387,15 @@
       <fips-code>MX</fips-code>
       <timezones>
         <timezone id="America/Tijuana">
-          <_name>Pacific Time</_name>
+          <name>Pacific Time</name>
         </timezone>
         <timezone id="America/Mazatlan">
-          <_name>Mountain Time</_name>
+          <name>Mountain Time</name>
           <obsoletes>America/Chihuahua</obsoletes>
           <obsoletes>America/Hermosillo</obsoletes>
         </timezone>
         <timezone id="America/Mexico_City">
-          <_name>Central Time</_name>
+          <name>Central Time</name>
           <obsoletes>America/Cancun</obsoletes>
           <obsoletes>America/Merida</obsoletes>
           <obsoletes>America/Monterrey</obsoletes>
@@ -27403,12 +27403,12 @@
       </timezones>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Aguascalientes</_name>
+        <name msgctxt="State in Mexico">Aguascalientes</name>
         <fips-code>MX01</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Aguascalientes in Mexico -->
-          <_name msgctxt="City in Aguascalientes, Mexico">Aguascalientes</_name>
+          <name msgctxt="City in Aguascalientes, Mexico">Aguascalientes</name>
           <coordinates>21.883333 -102.300000</coordinates>
           <location>
             <name>Aguascalientes</name>
@@ -27419,12 +27419,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Baja California</_name>
+        <name>Baja California</name>
         <fips-code>MX02</fips-code>
         <tz-hint>America/Tijuana</tz-hint>
         <city>
           <!-- A city in Baja California in Mexico -->
-          <_name>Mexicali</_name>
+          <name>Mexicali</name>
           <coordinates>32.651944 -115.468333</coordinates>
           <location>
             <name>Mexicali International Airport</name>
@@ -27434,7 +27434,7 @@
         </city>
         <city>
           <!-- A city in Baja California in Mexico -->
-          <_name>Tijuana</_name>
+          <name>Tijuana</name>
           <coordinates>32.533333 -117.016667</coordinates>
           <location>
             <name>Tijuana International Airport</name>
@@ -27445,12 +27445,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Baja California Sur</_name>
+        <name>Baja California Sur</name>
         <fips-code>MX03</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
           <!-- A city in Baja California Sur in Mexico -->
-          <_name msgctxt="City in Baja California Sur, Mexico">La Paz</_name>
+          <name msgctxt="City in Baja California Sur, Mexico">La Paz</name>
           <coordinates>24.166667 -110.300000</coordinates>
           <location>
             <name>La Paz International Airport</name>
@@ -27460,7 +27460,7 @@
         </city>
         <city>
           <!-- A city in Baja California Sur in Mexico -->
-          <_name>Loreto</_name>
+          <name>Loreto</name>
           <coordinates>26.016667 -111.350000</coordinates>
           <location>
             <name>Loreto</name>
@@ -27470,7 +27470,7 @@
         </city>
         <city>
           <!-- A city in Baja California Sur in Mexico -->
-          <_name>San José del Cabo</_name>
+          <name>San José del Cabo</name>
           <coordinates>23.050000 -109.683333</coordinates>
           <location>
             <name>San José del Cabo</name>
@@ -27481,12 +27481,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Campeche</_name>
+        <name msgctxt="State in Mexico">Campeche</name>
         <fips-code>MX04</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Campeche in Mexico -->
-          <_name msgctxt="City in Campeche, Mexico">Campeche</_name>
+          <name msgctxt="City in Campeche, Mexico">Campeche</name>
           <coordinates>19.850000 -90.533333</coordinates>
           <location>
             <name>Campeche</name>
@@ -27496,7 +27496,7 @@
         </city>
         <city>
           <!-- A city in Campeche in Mexico -->
-          <_name>Carmen</_name>
+          <name>Carmen</name>
           <coordinates>18.633333 -91.833333</coordinates>
           <location>
             <name>Carmen</name>
@@ -27507,12 +27507,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Chiapas</_name>
+        <name>Chiapas</name>
         <fips-code>MX05</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Chiapas in Mexico -->
-          <_name>Tapachula</_name>
+          <name>Tapachula</name>
           <coordinates>14.900000 -92.283333</coordinates>
           <location>
             <name>Tapachula</name>
@@ -27522,7 +27522,7 @@
         </city>
         <city>
           <!-- A city in Chiapas in Mexico -->
-          <_name>Tuxtla</_name>
+          <name>Tuxtla</name>
           <coordinates>16.750000 -93.116667</coordinates>
           <location>
             <name>Tuxtla</name>
@@ -27533,12 +27533,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Chihuahua</_name>
+        <name msgctxt="State in Mexico">Chihuahua</name>
         <fips-code>MX06</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
           <!-- A city in Chihuahua in Mexico -->
-          <_name msgctxt="City in Chihuahua, Mexico">Chihuahua</_name>
+          <name msgctxt="City in Chihuahua, Mexico">Chihuahua</name>
           <coordinates>28.633333 -106.083333</coordinates>
           <location>
             <name>Chihuahua International Airport</name>
@@ -27549,12 +27549,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Coahuila</_name>
+        <name>Coahuila</name>
         <fips-code>MX07</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Coahuila in Mexico -->
-          <_name>Monclova</_name>
+          <name>Monclova</name>
           <coordinates>26.900000 -101.416667</coordinates>
           <location>
             <name>Monclova</name>
@@ -27564,7 +27564,7 @@
         </city>
         <city>
           <!-- A city in Coahuila in Mexico -->
-          <_name>Piedras Negras</_name>
+          <name>Piedras Negras</name>
           <coordinates>28.700000 -100.516667</coordinates>
           <location>
             <name>Piedras Negras</name>
@@ -27574,7 +27574,7 @@
         </city>
         <city>
           <!-- A city in Coahuila in Mexico -->
-          <_name>Saltillo</_name>
+          <name>Saltillo</name>
           <coordinates>25.416667 -101.000000</coordinates>
           <location>
             <name>Saltillo</name>
@@ -27584,7 +27584,7 @@
         </city>
         <city>
           <!-- A city in Coahuila in Mexico -->
-          <_name>Torreón</_name>
+          <name>Torreón</name>
           <coordinates>25.550000 -103.433333</coordinates>
           <location>
             <name>Torreón</name>
@@ -27595,12 +27595,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Colima</_name>
+        <name msgctxt="State in Mexico">Colima</name>
         <fips-code>MX08</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Colima in Mexico -->
-          <_name msgctxt="City in Colima, Mexico">Colima</_name>
+          <name msgctxt="City in Colima, Mexico">Colima</name>
           <coordinates>19.233333 -103.716667</coordinates>
           <location>
             <name>Colima</name>
@@ -27610,7 +27610,7 @@
         </city>
         <city>
           <!-- A city in Colima in Mexico -->
-          <_name msgctxt="City in Colima, Mexico">Manzanillo</_name>
+          <name msgctxt="City in Colima, Mexico">Manzanillo</name>
           <coordinates>19.050000 -104.333333</coordinates>
           <location>
             <name>Manzanillo International Airport</name>
@@ -27621,7 +27621,7 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Distrito Federal</_name>
+        <name msgctxt="State in Mexico">Distrito Federal</name>
         <fips-code>MX09</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
@@ -27629,7 +27629,7 @@
                "Mexico City" is the traditional English name.
                The local name in Spanish is "México".
             -->
-          <_name>Mexico City</_name>
+          <name>Mexico City</name>
           <coordinates>19.434167 -99.138611</coordinates>
           <location>
             <name>Licenci Airport</name>
@@ -27640,12 +27640,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Durango</_name>
+        <name msgctxt="State in Mexico">Durango</name>
         <fips-code>MX10</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Durango in Mexico -->
-          <_name msgctxt="City in Durango, Mexico">Durango</_name>
+          <name msgctxt="City in Durango, Mexico">Durango</name>
           <coordinates>24.033333 -104.666667</coordinates>
           <location>
             <name>Durango Airport</name>
@@ -27656,12 +27656,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Guanajuato</_name>
+        <name>Guanajuato</name>
         <fips-code>MX11</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Guanajuato in Mexico -->
-          <_name msgctxt="City in Guanajuato, Mexico">León</_name>
+          <name msgctxt="City in Guanajuato, Mexico">León</name>
           <coordinates>21.116667 -101.666667</coordinates>
           <location>
             <name>Del Bajio, León Airport</name>
@@ -27672,12 +27672,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Guerrero</_name>
+        <name>Guerrero</name>
         <fips-code>MX12</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Guerrero in Mexico -->
-          <_name>Acapulco</_name>
+          <name>Acapulco</name>
           <coordinates>16.850000 -99.916667</coordinates>
           <location>
             <name>G. Alvarez Airport</name>
@@ -27687,7 +27687,7 @@
         </city>
         <city>
           <!-- A city in Guerrero in Mexico -->
-          <_name>Ixtapa</_name>
+          <name>Ixtapa</name>
           <coordinates>17.666667 -101.650000</coordinates>
           <location>
             <name>Ixtapa-Zihuatanejo</name>
@@ -27698,18 +27698,18 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Hidalgo</_name>
+        <name>Hidalgo</name>
         <fips-code>MX13</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Jalisco</_name>
+        <name>Jalisco</name>
         <fips-code>MX14</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Jalisco in Mexico -->
-          <_name>Guadalajara</_name>
+          <name>Guadalajara</name>
           <coordinates>20.666667 -103.333333</coordinates>
           <location>
             <name>Don Miguel, Guadalajara Airport</name>
@@ -27719,7 +27719,7 @@
         </city>
         <city>
           <!-- A city in Jalisco in Mexico -->
-          <_name>Puerto Vallarta</_name>
+          <name>Puerto Vallarta</name>
           <coordinates>20.616667 -105.250000</coordinates>
           <location>
             <name>Lic Airport</name>
@@ -27730,12 +27730,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Michoacán</_name>
+        <name>Michoacán</name>
         <fips-code>MX16</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Michoacán in Mexico -->
-          <_name>Morelia</_name>
+          <name>Morelia</name>
           <coordinates>19.700000 -101.116667</coordinates>
           <location>
             <name>Morelia New</name>
@@ -27745,7 +27745,7 @@
         </city>
         <city>
           <!-- A city in Michoacán in Mexico -->
-          <_name>Uruapan</_name>
+          <name>Uruapan</name>
           <coordinates>19.416667 -102.066667</coordinates>
           <location>
             <name>Gen Rayon Airport</name>
@@ -27756,12 +27756,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Morelos</_name>
+        <name>Morelos</name>
         <fips-code>MX17</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Morelos in Mexico -->
-          <_name>Cuernavaca</_name>
+          <name>Cuernavaca</name>
           <coordinates>18.916667 -99.250000</coordinates>
           <location>
             <name>Cuernavaca</name>
@@ -27772,14 +27772,14 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>México</_name>
+        <name>México</name>
         <fips-code>MX15</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in México in Mexico.
                One of several cities in Mexico called "Juárez".
             -->
-          <_name>Ciudad Juárez</_name>
+          <name>Ciudad Juárez</name>
           <coordinates>31.733333 -106.483333</coordinates>
           <location>
             <name>Ciudad Juárez International Airport</name>
@@ -27789,7 +27789,7 @@
         </city>
         <city>
           <!-- A city in México in Mexico -->
-          <_name>Toluca</_name>
+          <name>Toluca</name>
           <coordinates>19.288333 -99.667222</coordinates>
           <location>
             <name>Jose Maria Airport</name>
@@ -27800,18 +27800,18 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Nayarit</_name>
+        <name>Nayarit</name>
         <fips-code>MX18</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Nuevo León</_name>
+        <name>Nuevo León</name>
         <fips-code>MX19</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Nuevo León in Mexico -->
-          <_name>Monterrey</_name>
+          <name>Monterrey</name>
           <coordinates>25.666667 -100.316667</coordinates>
           <location>
             <name>Monterrey International Airport</name>
@@ -27827,12 +27827,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Oaxaca</_name>
+        <name msgctxt="State in Mexico">Oaxaca</name>
         <fips-code>MX18</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Oaxaca in Mexico -->
-          <_name>El Zapote</_name>
+          <name>El Zapote</name>
           <coordinates>15.771111 -96.263056</coordinates>
           <location>
             <name>Bahias de Huatulco</name>
@@ -27842,7 +27842,7 @@
         </city>
         <city>
           <!-- A city in Oaxaca in Mexico -->
-          <_name>Ixtepec</_name>
+          <name>Ixtepec</name>
           <coordinates>16.578056 -95.101389</coordinates>
           <location>
             <name>Ixtepec Ox</name>
@@ -27852,7 +27852,7 @@
         </city>
         <city>
           <!-- A city in Oaxaca in Mexico -->
-          <_name>Laguna Tepic</_name>
+          <name>Laguna Tepic</name>
           <coordinates>21.516667 -104.883333</coordinates>
           <location>
             <name>Laguna Tepic</name>
@@ -27862,7 +27862,7 @@
         </city>
         <city>
           <!-- A city in Oaxaca in Mexico -->
-          <_name msgctxt="City in Oaxaca, Mexico">Oaxaca</_name>
+          <name msgctxt="City in Oaxaca, Mexico">Oaxaca</name>
           <coordinates>17.050000 -96.716667</coordinates>
           <location>
             <name>Xoxocotlan Airport</name>
@@ -27872,7 +27872,7 @@
         </city>
         <city>
           <!-- A city in Oaxaca in Mexico -->
-          <_name>Puerto Escondido</_name>
+          <name>Puerto Escondido</name>
           <coordinates>15.850000 -97.066667</coordinates>
           <location>
             <name>Puerto Escondido</name>
@@ -27883,12 +27883,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Puebla</_name>
+        <name msgctxt="State in Mexico">Puebla</name>
         <fips-code>MX21</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Puebla in Mexico -->
-          <_name msgctxt="City in Puebla, Mexico">Puebla</_name>
+          <name msgctxt="City in Puebla, Mexico">Puebla</name>
           <coordinates>19.050000 -98.200000</coordinates>
           <location>
             <name>Puebla</name>
@@ -27899,12 +27899,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Querétaro</_name>
+        <name msgctxt="State in Mexico">Querétaro</name>
         <fips-code>MX22</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Querétaro in Mexico -->
-          <_name msgctxt="City in Querétaro, Mexico">Querétaro</_name>
+          <name msgctxt="City in Querétaro, Mexico">Querétaro</name>
           <coordinates>20.600000 -100.383333</coordinates>
           <location>
             <name>Querétaro</name>
@@ -27915,12 +27915,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Quintana Roo</_name>
+        <name>Quintana Roo</name>
         <fips-code>MX23</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Quintana Roo in Mexico -->
-          <_name>Cancún</_name>
+          <name>Cancún</name>
           <coordinates>21.166667 -86.833333</coordinates>
           <location>
             <name>Cancún International Airport</name>
@@ -27930,7 +27930,7 @@
         </city>
         <city>
           <!-- A city in Quintana Roo in Mexico -->
-          <_name>Chetumal</_name>
+          <name>Chetumal</name>
           <coordinates>18.500000 -88.300000</coordinates>
           <location>
             <name>Chetumal</name>
@@ -27940,7 +27940,7 @@
         </city>
         <city>
           <!-- A city in Quintana Roo in Mexico -->
-          <_name>Cozumel</_name>
+          <name>Cozumel</name>
           <coordinates>20.508333 -86.945833</coordinates>
           <location>
             <name>Cozumel Airport</name>
@@ -27951,12 +27951,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">San Luis Potosí</_name>
+        <name msgctxt="State in Mexico">San Luis Potosí</name>
         <fips-code>MX24</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in San Luis Potosí in Mexico -->
-          <_name msgctxt="City in San Luis Potosí, Mexico">San Luis Potosí</_name>
+          <name msgctxt="City in San Luis Potosí, Mexico">San Luis Potosí</name>
           <coordinates>22.150000 -100.983333</coordinates>
           <location>
             <name>San Luis Potosí</name>
@@ -27967,12 +27967,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Sinaloa</_name>
+        <name>Sinaloa</name>
         <fips-code>MX25</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
           <!-- A city in Sinaloa in Mexico -->
-          <_name>Culiacán</_name>
+          <name>Culiacán</name>
           <coordinates>24.799444 -107.389722</coordinates>
           <location>
             <name>Culiacán</name>
@@ -27982,7 +27982,7 @@
         </city>
         <city>
           <!-- A city in Sinaloa in Mexico -->
-          <_name>Los Mochis</_name>
+          <name>Los Mochis</name>
           <coordinates>25.766667 -108.966667</coordinates>
           <location>
             <name>Los Mochis Airport</name>
@@ -27992,7 +27992,7 @@
         </city>
         <city>
           <!-- A city in Sinaloa in Mexico -->
-          <_name>Mazatlán</_name>
+          <name>Mazatlán</name>
           <coordinates>23.216667 -106.416667</coordinates>
           <location>
             <name>G. Buelna Airport</name>
@@ -28003,12 +28003,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Sonora</_name>
+        <name msgctxt="State in Mexico">Sonora</name>
         <fips-code>MX26</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
           <!-- A city in Sonora in Mexico -->
-          <_name>Ciudad Obregón</_name>
+          <name>Ciudad Obregón</name>
           <coordinates>27.483333 -109.933333</coordinates>
           <location>
             <name>Ciudad Obregón</name>
@@ -28018,7 +28018,7 @@
         </city>
         <city>
           <!-- A city in Sonora in Mexico -->
-          <_name>Guaymas</_name>
+          <name>Guaymas</name>
           <coordinates>27.933333 -110.900000</coordinates>
           <location>
             <name>Guaymas International Airport</name>
@@ -28028,7 +28028,7 @@
         </city>
         <city>
           <!-- A city in Sonora in Mexico -->
-          <_name>Hermosillo</_name>
+          <name>Hermosillo</name>
           <coordinates>29.066667 -110.966667</coordinates>
           <location>
             <name>Hermosillo</name>
@@ -28039,12 +28039,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Tabasco</_name>
+        <name>Tabasco</name>
         <fips-code>MX27</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Tabasco in Mexico -->
-          <_name>Villahermosa</_name>
+          <name>Villahermosa</name>
           <coordinates>17.983333 -92.916667</coordinates>
           <location>
             <name>Villahermosa</name>
@@ -28055,12 +28055,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Tamaulipas</_name>
+        <name>Tamaulipas</name>
         <fips-code>MX28</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Tamaulipas in Mexico -->
-          <_name>Ciudad Victoria</_name>
+          <name>Ciudad Victoria</name>
           <coordinates>23.733333 -99.133333</coordinates>
           <location>
             <name>Ciudad Victoria Airport</name>
@@ -28070,7 +28070,7 @@
         </city>
         <city>
           <!-- A city in Tamaulipas in Mexico -->
-          <_name>Matamoros</_name>
+          <name>Matamoros</name>
           <coordinates>25.883333 -97.500000</coordinates>
           <location>
             <name>Matamoros International Airport</name>
@@ -28080,7 +28080,7 @@
         </city>
         <city>
           <!-- A city in Tamaulipas in Mexico -->
-          <_name>Nuevo Laredo</_name>
+          <name>Nuevo Laredo</name>
           <coordinates>27.500000 -99.516667</coordinates>
           <location>
             <name>Nuevo Laredo International Airport</name>
@@ -28090,7 +28090,7 @@
         </city>
         <city>
           <!-- A city in Tamaulipas in Mexico -->
-          <_name>Reynosa</_name>
+          <name>Reynosa</name>
           <coordinates>26.083333 -98.283333</coordinates>
           <location>
             <name>Reynosa International Airport</name>
@@ -28100,7 +28100,7 @@
         </city>
         <city>
           <!-- A city in Tamaulipas in Mexico -->
-          <_name>Tampico</_name>
+          <name>Tampico</name>
           <coordinates>22.300000 -97.850000</coordinates>
           <location>
             <name>Gen Fj Mina Airport</name>
@@ -28111,18 +28111,18 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Tlaxcala</_name>
+        <name>Tlaxcala</name>
         <fips-code>MX29</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Veracruz</_name>
+        <name msgctxt="State in Mexico">Veracruz</name>
         <fips-code>MX30</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Veracruz in Mexico -->
-          <_name>Minatitlán</_name>
+          <name>Minatitlán</name>
           <coordinates>17.983333 -94.516667</coordinates>
           <location>
             <name>Minatitlán</name>
@@ -28134,7 +28134,7 @@
           <!-- A city in Veracruz in Mexico.
                One of several cities in Mexico called "Poza Rica".
             -->
-          <_name>Poza Rica de Hidalgo</_name>
+          <name>Poza Rica de Hidalgo</name>
           <coordinates>20.550000 -97.450000</coordinates>
           <location>
             <name>Palizada Airport</name>
@@ -28144,7 +28144,7 @@
         </city>
         <city>
           <!-- A city in Veracruz in Mexico -->
-          <_name msgctxt="City in Veracruz, Mexico">Veracruz</_name>
+          <name msgctxt="City in Veracruz, Mexico">Veracruz</name>
           <coordinates>19.200000 -96.133333</coordinates>
           <location>
             <name>Veracruz / Las Bajadas, General Heriberto Jara Airport</name>
@@ -28155,12 +28155,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name>Yucatán</_name>
+        <name>Yucatán</name>
         <fips-code>MX31</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Yucatán in Mexico -->
-          <_name>Chichén-Itzá</_name>
+          <name>Chichén-Itzá</name>
           <coordinates>20.666667 -88.566667</coordinates>
           <location>
             <name>Chichén-Itzá</name>
@@ -28170,7 +28170,7 @@
         </city>
         <city>
           <!-- A city in Yucatán in Mexico -->
-          <_name msgctxt="City in Yucatán, Mexico">Mérida</_name>
+          <name msgctxt="City in Yucatán, Mexico">Mérida</name>
           <coordinates>20.966667 -89.616667</coordinates>
           <location>
             <name>Manuel Crecencio Airport</name>
@@ -28181,12 +28181,12 @@
       </state>
       <state>
         <!-- A state/province/territory in Mexico -->
-        <_name msgctxt="State in Mexico">Zacatecas</_name>
+        <name msgctxt="State in Mexico">Zacatecas</name>
         <fips-code>MX32</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
           <!-- A city in Zacatecas in Mexico -->
-          <_name msgctxt="City in Zacatecas, Mexico">Zacatecas</_name>
+          <name msgctxt="City in Zacatecas, Mexico">Zacatecas</name>
           <coordinates>22.783333 -102.583333</coordinates>
           <location>
             <name>Zacatecas Airport</name>
@@ -28201,7 +28201,7 @@
            America (off the coast of Newfoundland). The French name is
            "Saint-Pierre-et-Miquelon".
         -->
-      <_name>Saint Pierre and Miquelon</_name>
+      <name>Saint Pierre and Miquelon</name>
       <iso-code>PM</iso-code>
       <fips-code>SB</fips-code>
       <timezones>
@@ -28210,7 +28210,7 @@
       <tz-hint>America/Miquelon</tz-hint>
       <city>
         <!-- The capital of Saint Pierre and Miquelon -->
-        <_name msgctxt="City in Saint Pierre and Miquelon">Saint-Pierre</_name>
+        <name msgctxt="City in Saint Pierre and Miquelon">Saint-Pierre</name>
         <coordinates>46.766667 -56.183333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -28221,7 +28221,7 @@
     </country>
     <country>
       <!-- US - United States, aka United States of America -->
-      <_name>United States</_name>
+      <name>United States</name>
       <!-- Could not find cities for the following weather stations:
            PALU - Cape Lisburne, Cape Lisburne LRRS Airport (68.883333
            -166.100000)
@@ -28273,7 +28273,7 @@
                Daylight Saving Time). It is only used in places where
                "United States" is already clear from context.
             -->
-          <_name>Hawaiian-Aleutian Time (Aleutian Islands)</_name>
+          <name>Hawaiian-Aleutian Time (Aleutian Islands)</name>
         </timezone>
         <timezone id="Pacific/Honolulu">
           <!-- "Hawaiian-Aleutian Time" is the official name of the
@@ -28283,23 +28283,23 @@
                Daylight Saving Time. It is only used in places where
                "United States" is already clear from context.
             -->
-          <_name>Hawaiian-Aleutian Time, no DST (Hawaii)</_name>
+          <name>Hawaiian-Aleutian Time, no DST (Hawaii)</name>
         </timezone>
         <timezone id="America/Anchorage">
           <!-- The time zone used in the majority of Alaska in the
                United States. The string is only used in places where
                "United States" is already clear from context.
             -->
-          <_name>Alaska Time</_name>
+          <name>Alaska Time</name>
           <obsoletes>America/Juneau</obsoletes>
           <obsoletes>America/Nome</obsoletes>
           <obsoletes>America/Yakutat</obsoletes>
         </timezone>
         <timezone id="America/Los_Angeles">
-          <_name>Pacific Time</_name>
+          <name>Pacific Time</name>
         </timezone>
         <timezone id="America/Denver">
-          <_name>Mountain Time</_name>
+          <name>Mountain Time</name>
           <obsoletes>America/Boise</obsoletes>
           <obsoletes>America/Shiprock</obsoletes>
         </timezone>
@@ -28310,10 +28310,10 @@
                the zone. The string is only used in places where
                "United States" is already clear from context.
             -->
-          <_name>Mountain Time, no DST (Arizona)</_name>
+          <name>Mountain Time, no DST (Arizona)</name>
         </timezone>
         <timezone id="America/Chicago">
-          <_name>Central Time</_name>
+          <name>Central Time</name>
           <obsoletes>America/Indiana/Knox</obsoletes>
           <obsoletes>America/Indiana/Tell_City</obsoletes>
           <obsoletes>America/Menominee</obsoletes>
@@ -28321,7 +28321,7 @@
           <obsoletes>America/North_Dakota/New_Salem</obsoletes>
         </timezone>
         <timezone id="America/New_York">
-          <_name>Eastern Time</_name>
+          <name>Eastern Time</name>
           <obsoletes>America/Detroit</obsoletes>
           <obsoletes>America/Indiana/Indianapolis</obsoletes>
           <obsoletes>America/Indiana/Marengo</obsoletes>
@@ -28335,12 +28335,12 @@
       </timezones>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Alabama</_name>
+        <name>Alabama</name>
         <fips-code>US01</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Alabaster</_name>
+          <name>Alabaster</name>
           <coordinates>33.244281 -86.816377</coordinates>
           <location>
             <name>Shelby County Airport</name>
@@ -28352,7 +28352,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Albertville</_name>
+          <name>Albertville</name>
           <coordinates>34.267594 -86.208867</coordinates>
           <location>
             <name>Albertville Municipal Airport</name>
@@ -28362,7 +28362,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Alexander City</_name>
+          <name>Alexander City</name>
           <coordinates>32.944012 -85.953853</coordinates>
           <location>
             <name>Thomas C Russell Field Airport</name>
@@ -28372,7 +28372,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Andalusia</_name>
+          <name>Andalusia</name>
           <coordinates>31.308504 -86.483291</coordinates>
           <location>
             <name>Andalusia-Opp Municipal Airport</name>
@@ -28382,7 +28382,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Anniston</_name>
+          <name>Anniston</name>
           <coordinates>33.659826 -85.831632</coordinates>
           <location>
             <name>Anniston Metropolitan Airport</name>
@@ -28394,7 +28394,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Auburn</_name>
+          <name msgctxt="City in Alabama, United States">Auburn</name>
           <coordinates>32.609857 -85.480783</coordinates>
           <location>
             <name>Auburn-Opelika Airport</name>
@@ -28406,7 +28406,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Birmingham</_name>
+          <name msgctxt="City in Alabama, United States">Birmingham</name>
           <coordinates>33.520661 -86.802490</coordinates>
           <location>
             <name>Birmingham International Airport</name>
@@ -28418,7 +28418,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Cullman</_name>
+          <name>Cullman</name>
           <coordinates>34.174821 -86.843612</coordinates>
           <location>
             <name>Folsom Field Airport</name>
@@ -28428,7 +28428,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Daleville</_name>
+          <name>Daleville</name>
           <coordinates>31.310172 -85.712991</coordinates>
           <location>
             <name>Fort Rucker, Lowe Army Heliport</name>
@@ -28438,7 +28438,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Decatur</_name>
+          <name msgctxt="City in Alabama, United States">Decatur</name>
           <coordinates>34.605925 -86.983342</coordinates>
           <location>
             <name>Pryor Field</name>
@@ -28449,7 +28449,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Dothan</_name>
+          <name>Dothan</name>
           <coordinates>31.223231 -85.390489</coordinates>
           <location>
             <name>Dothan Regional Airport</name>
@@ -28461,7 +28461,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Evergreen</_name>
+          <name>Evergreen</name>
           <coordinates>31.433499 -86.956918</coordinates>
           <location>
             <name>Middleton Field</name>
@@ -28472,7 +28472,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Fort Payne</_name>
+          <name>Fort Payne</name>
           <coordinates>34.444255 -85.719689</coordinates>
           <location>
             <name>Isbell Field Airport</name>
@@ -28482,7 +28482,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Gadsden</_name>
+          <name>Gadsden</name>
           <coordinates>34.014264 -86.006639</coordinates>
           <location>
             <name>Gadsden Municipal Airport</name>
@@ -28494,7 +28494,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Haleyville</_name>
+          <name>Haleyville</name>
           <coordinates>34.226488 -87.621413</coordinates>
           <location>
             <name>Posey Field Airport</name>
@@ -28504,7 +28504,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Huntsville</_name>
+          <name msgctxt="City in Alabama, United States">Huntsville</name>
           <coordinates>34.730369 -86.586104</coordinates>
           <location>
             <name>Madison County Executive Airport</name>
@@ -28523,7 +28523,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Mobile</_name>
+          <name>Mobile</name>
           <coordinates>30.694357 -88.043054</coordinates>
           <location>
             <name>Mobile Downtown Airport</name>
@@ -28542,7 +28542,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Montgomery</_name>
+          <name msgctxt="City in Alabama, United States">Montgomery</name>
           <coordinates>32.366805 -86.299969</coordinates>
           <location>
             <name>Maxwell Air Force Base / Montgomery</name>
@@ -28561,7 +28561,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Muscle Shoals</_name>
+          <name>Muscle Shoals</name>
           <coordinates>34.744811 -87.667529</coordinates>
           <location>
             <name>North West Alabama Regional Airport</name>
@@ -28573,7 +28573,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Ozark</_name>
+          <name>Ozark</name>
           <coordinates>31.459058 -85.640493</coordinates>
           <location>
             <name>Hanchey AHP / Ozark</name>
@@ -28590,7 +28590,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name msgctxt="City in Alabama, United States">Troy</_name>
+          <name msgctxt="City in Alabama, United States">Troy</name>
           <coordinates>31.808768 -85.969951</coordinates>
           <location>
             <name>Troy Municipal Airport</name>
@@ -28600,7 +28600,7 @@
         </city>
         <city>
           <!-- A city in Alabama in the United States -->
-          <_name>Tuscaloosa</_name>
+          <name>Tuscaloosa</name>
           <coordinates>33.209841 -87.569174</coordinates>
           <location>
             <name>Tuscaloosa Regional Airport</name>
@@ -28613,12 +28613,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Alaska</_name>
+        <name>Alaska</name>
         <fips-code>US02</fips-code>
         <tz-hint>America/Anchorage</tz-hint>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Adak</_name>
+          <name>Adak</name>
           <coordinates>51.880000 -176.658056</coordinates>
           <location>
             <name>Adak Island, Adak Airport</name>
@@ -28631,7 +28631,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Alpine</_name>
+          <name msgctxt="City in Alaska, United States">Alpine</name>
           <coordinates>70.328056 -150.977500</coordinates>
           <location>
             <name>Deadhorse, Alpine Airstrip</name>
@@ -28643,7 +28643,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Ambler</_name>
+          <name>Ambler</name>
           <coordinates>67.086111 -157.851389</coordinates>
           <location>
             <name>Ambler Airport</name>
@@ -28655,7 +28655,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Anaktuvuk Pass</_name>
+          <name>Anaktuvuk Pass</name>
           <coordinates>68.143333 -151.735833</coordinates>
           <location>
             <name>Anaktuvuk Pass Airport</name>
@@ -28667,7 +28667,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Anchorage</_name>
+          <name>Anchorage</name>
           <coordinates>61.218056 -149.900278</coordinates>
           <location>
             <name>Merrill Field Airport</name>
@@ -28700,7 +28700,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Angoon</_name>
+          <name>Angoon</name>
           <coordinates>57.503333 -134.583889</coordinates>
           <location>
             <name>Angoon</name>
@@ -28711,7 +28711,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Aniak</_name>
+          <name>Aniak</name>
           <coordinates>61.578333 -159.522222</coordinates>
           <location>
             <name>Aniak Airport</name>
@@ -28723,7 +28723,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Annette</_name>
+          <name>Annette</name>
           <coordinates>55.061667 -131.541667</coordinates>
           <location>
             <name>Annette Island Airport</name>
@@ -28734,7 +28734,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Anvik</_name>
+          <name>Anvik</name>
           <coordinates>62.656111 -160.206667</coordinates>
           <location>
             <name>Anvik Airport</name>
@@ -28745,7 +28745,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Arctic Village</_name>
+          <name>Arctic Village</name>
           <coordinates>68.126944 -145.537778</coordinates>
           <location>
             <name>Arctic Village Airport</name>
@@ -28756,7 +28756,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Barrow</_name>
+          <name>Barrow</name>
           <coordinates>71.290556 -156.788611</coordinates>
           <location>
             <name>Wiley Post-Will Rogers Memorial Airport</name>
@@ -28768,7 +28768,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Bethel</_name>
+          <name>Bethel</name>
           <coordinates>60.792222 -161.755833</coordinates>
           <location>
             <name>Bethel Airport</name>
@@ -28780,7 +28780,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Bettles</_name>
+          <name>Bettles</name>
           <coordinates>66.918889 -151.516111</coordinates>
           <location>
             <name>Bettles Airport</name>
@@ -28792,7 +28792,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Birchwood</_name>
+          <name>Birchwood</name>
           <coordinates>61.405278 -149.468889</coordinates>
           <location>
             <name>Birchwood Airport</name>
@@ -28803,7 +28803,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Buckland</_name>
+          <name>Buckland</name>
           <coordinates>65.979722 -161.123056</coordinates>
           <location>
             <name>Buckland Airport</name>
@@ -28814,7 +28814,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Chandalar</_name>
+          <name>Chandalar</name>
           <coordinates>67.505278 -148.493611</coordinates>
           <location>
             <name>Chandalar Lake, Chandalar Lake Airport</name>
@@ -28826,7 +28826,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Chignik</_name>
+          <name>Chignik</name>
           <coordinates>56.295278 -158.402222</coordinates>
           <location>
             <name>Chignik Airport</name>
@@ -28836,7 +28836,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Chisana</_name>
+          <name>Chisana</name>
           <coordinates>62.066111 -142.040833</coordinates>
           <location>
             <name>Snowshoe Lake</name>
@@ -28847,7 +28847,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Chistochina</_name>
+          <name>Chistochina</name>
           <coordinates>62.565000 -144.664722</coordinates>
           <location>
             <name>Slana Airport</name>
@@ -28858,7 +28858,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Chulitna</_name>
+          <name>Chulitna</name>
           <coordinates>62.886944 -149.583056</coordinates>
           <location>
             <name>Chulitna Airport</name>
@@ -28869,7 +28869,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Cold Bay</_name>
+          <name>Cold Bay</name>
           <coordinates>55.185833 -162.721111</coordinates>
           <location>
             <name>Cold Bay Airport</name>
@@ -28881,7 +28881,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Cordova</_name>
+          <name>Cordova</name>
           <coordinates>60.542778 -145.757500</coordinates>
           <location>
             <name>Merle K (Mudhole) Smith Airport</name>
@@ -28893,7 +28893,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Deadhorse</_name>
+          <name>Deadhorse</name>
           <coordinates>70.205556 -148.511667</coordinates>
           <location>
             <name>Deadhorse Airport</name>
@@ -28905,7 +28905,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Delta Junction</_name>
+          <name>Delta Junction</name>
           <coordinates>64.037778 -145.732222</coordinates>
           <location>
             <name>Delta Junction / Ft Greely, Allen Army Airfield</name>
@@ -28916,7 +28916,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Dillingham</_name>
+          <name>Dillingham</name>
           <coordinates>59.039722 -158.457500</coordinates>
           <location>
             <name>Dillingham Airport</name>
@@ -28928,7 +28928,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Eagle</_name>
+          <name msgctxt="City in Alaska, United States">Eagle</name>
           <coordinates>64.788056 -141.200000</coordinates>
           <location>
             <name>Eagle Airport</name>
@@ -28939,7 +28939,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Egegik</_name>
+          <name>Egegik</name>
           <coordinates>58.215556 -157.375833</coordinates>
           <location>
             <name>Egegik Airport</name>
@@ -28950,7 +28950,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Elfin Cove</_name>
+          <name>Elfin Cove</name>
           <coordinates>58.194444 -136.343333</coordinates>
           <location>
             <name>Elfin Cove Seaplane Base</name>
@@ -28962,7 +28962,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Emmonak</_name>
+          <name>Emmonak</name>
           <coordinates>62.777778 -164.523056</coordinates>
           <location>
             <name>Emmonak Airport</name>
@@ -28973,7 +28973,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Eureka Roadhouse</_name>
+          <name>Eureka Roadhouse</name>
           <coordinates>61.938611 -147.168056</coordinates>
           <location>
             <name>Eureka, Skelton Airport</name>
@@ -28990,7 +28990,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Fairbanks</_name>
+          <name>Fairbanks</name>
           <coordinates>64.837778 -147.716389</coordinates>
           <location>
             <name>Fort Wainwright AAF</name>
@@ -29016,7 +29016,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Fort Yukon</_name>
+          <name>Fort Yukon</name>
           <coordinates>66.564722 -145.273889</coordinates>
           <location>
             <name>Fort Yukon Airport</name>
@@ -29027,7 +29027,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Galena</_name>
+          <name>Galena</name>
           <coordinates>64.733333 -156.927500</coordinates>
           <location>
             <name>Edward G. Pitka Sr. Airport</name>
@@ -29037,7 +29037,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Gambell</_name>
+          <name>Gambell</name>
           <coordinates>63.779722 -171.741111</coordinates>
           <location>
             <name>Gambell Airport</name>
@@ -29049,7 +29049,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Gulkana</_name>
+          <name>Gulkana</name>
           <coordinates>62.271389 -145.382222</coordinates>
           <location>
             <name>Gulkana Airport</name>
@@ -29061,7 +29061,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Gustavus</_name>
+          <name>Gustavus</name>
           <coordinates>58.413333 -135.736944</coordinates>
           <location>
             <name>Gustavus Airport</name>
@@ -29073,7 +29073,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Haines</_name>
+          <name>Haines</name>
           <coordinates>59.235833 -135.445000</coordinates>
           <location>
             <name>Haines Airport</name>
@@ -29085,7 +29085,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Healy</_name>
+          <name>Healy</name>
           <coordinates>63.856944 -148.966111</coordinates>
           <location>
             <name>Healy River Airport</name>
@@ -29097,7 +29097,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Homer</_name>
+          <name>Homer</name>
           <coordinates>59.642500 -151.548333</coordinates>
           <location>
             <name>Homer Airport</name>
@@ -29109,7 +29109,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Hoonah</_name>
+          <name>Hoonah</name>
           <coordinates>58.110000 -135.443611</coordinates>
           <location>
             <name>Hoonah Seaplane Base</name>
@@ -29121,7 +29121,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Hooper Bay</_name>
+          <name>Hooper Bay</name>
           <coordinates>61.531111 -166.096667</coordinates>
           <location>
             <name>Hooper Bay Airport</name>
@@ -29132,7 +29132,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Huslia</_name>
+          <name>Huslia</name>
           <coordinates>65.698611 -156.399722</coordinates>
           <location>
             <name>Huslia Airport</name>
@@ -29142,7 +29142,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Hydaburg</_name>
+          <name>Hydaburg</name>
           <coordinates>55.208056 -132.826667</coordinates>
           <location>
             <name>Hydaburg Seaplane Base</name>
@@ -29153,7 +29153,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Juneau</_name>
+          <name msgctxt="City in Alaska, United States">Juneau</name>
           <coordinates>58.301944 -134.419722</coordinates>
           <location>
             <name>Juneau International Airport</name>
@@ -29165,7 +29165,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kake</_name>
+          <name>Kake</name>
           <coordinates>56.975833 -133.947222</coordinates>
           <location>
             <name>Kake Airport</name>
@@ -29177,7 +29177,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kaktovik</_name>
+          <name>Kaktovik</name>
           <coordinates>70.131944 -143.623889</coordinates>
           <location>
             <name>Barter Island, Barter Island LRRS Airport</name>
@@ -29188,7 +29188,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kaltag</_name>
+          <name>Kaltag</name>
           <coordinates>64.327222 -158.721944</coordinates>
           <location>
             <name>Kaltag Airport</name>
@@ -29198,7 +29198,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kenai</_name>
+          <name>Kenai</name>
           <coordinates>60.554444 -151.258333</coordinates>
           <location>
             <name>Kenai Municipal Airport</name>
@@ -29210,7 +29210,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Ketchikan</_name>
+          <name>Ketchikan</name>
           <coordinates>55.342222 -131.646111</coordinates>
           <location>
             <name>Ketchikan International Airport</name>
@@ -29222,7 +29222,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>King Salmon</_name>
+          <name>King Salmon</name>
           <coordinates>58.688333 -156.661389</coordinates>
           <location>
             <name>King Salmon Airport</name>
@@ -29234,7 +29234,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kipnuk</_name>
+          <name>Kipnuk</name>
           <coordinates>59.938889 -164.041389</coordinates>
           <location>
             <name>Kipnuk Airport</name>
@@ -29244,7 +29244,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kivalina</_name>
+          <name>Kivalina</name>
           <coordinates>67.726944 -164.533333</coordinates>
           <location>
             <name>Kivalina Airport</name>
@@ -29255,7 +29255,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Klawock</_name>
+          <name>Klawock</name>
           <coordinates>55.552222 -133.095833</coordinates>
           <location>
             <name>Klawock Airport</name>
@@ -29266,7 +29266,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kodiak</_name>
+          <name>Kodiak</name>
           <coordinates>57.790000 -152.407222</coordinates>
           <location>
             <name>Kodiak Airport</name>
@@ -29278,7 +29278,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kotzebue</_name>
+          <name>Kotzebue</name>
           <coordinates>66.898333 -162.596667</coordinates>
           <location>
             <name>Ralph Wien Memorial Airport</name>
@@ -29290,7 +29290,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Koyuk</_name>
+          <name>Koyuk</name>
           <coordinates>64.931944 -161.156944</coordinates>
           <location>
             <name>Koyuk Airport</name>
@@ -29301,7 +29301,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Kustatan</_name>
+          <name>Kustatan</name>
           <coordinates>60.715833 -151.747500</coordinates>
           <location>
             <name>Big River Lake</name>
@@ -29313,7 +29313,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Lake Minchumina</_name>
+          <name>Lake Minchumina</name>
           <coordinates>63.882778 -152.312222</coordinates>
           <location>
             <name>Minchumina, Minchumina Airport</name>
@@ -29324,7 +29324,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Lime Village</_name>
+          <name>Lime Village</name>
           <coordinates>61.356389 -155.435556</coordinates>
           <location>
             <name>Sparrevohn Airways Facilities Sector</name>
@@ -29335,7 +29335,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Manley Hot Springs</_name>
+          <name>Manley Hot Springs</name>
           <coordinates>65.001111 -150.633889</coordinates>
           <location>
             <name>Manly Hot Springs Airport</name>
@@ -29345,7 +29345,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>McCarthy</_name>
+          <name>McCarthy</name>
           <coordinates>61.433333 -142.921667</coordinates>
           <location>
             <name>McCarthy</name>
@@ -29357,7 +29357,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>McGrath</_name>
+          <name>McGrath</name>
           <coordinates>62.956389 -155.595833</coordinates>
           <location>
             <name>McGrath Airport</name>
@@ -29369,7 +29369,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>McKinley Park</_name>
+          <name>McKinley Park</name>
           <coordinates>63.732778 -148.914167</coordinates>
           <location>
             <name>McKinley National Park Airport</name>
@@ -29380,7 +29380,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Mekoryuk</_name>
+          <name>Mekoryuk</name>
           <coordinates>60.388056 -166.185000</coordinates>
           <location>
             <name>Mekoryuk Airport</name>
@@ -29392,7 +29392,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Metlakatla</_name>
+          <name>Metlakatla</name>
           <coordinates>55.129167 -131.572222</coordinates>
           <location>
             <name>Metlakatla Seaplane Base</name>
@@ -29403,7 +29403,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Nabesna</_name>
+          <name>Nabesna</name>
           <coordinates>62.371944 -143.008611</coordinates>
           <location>
             <name>Devil Mountain Lodge Airport</name>
@@ -29414,7 +29414,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Nenana</_name>
+          <name>Nenana</name>
           <coordinates>64.563889 -149.093056</coordinates>
           <location>
             <name>Nenana Municipal Airport</name>
@@ -29426,7 +29426,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Newhalen</_name>
+          <name>Newhalen</name>
           <coordinates>59.720000 -154.897222</coordinates>
           <location>
             <name>Iliamna, Iliamna Airport</name>
@@ -29438,7 +29438,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Noatak</_name>
+          <name>Noatak</name>
           <coordinates>67.571111 -162.965278</coordinates>
           <location>
             <name>Noatak Airport</name>
@@ -29449,7 +29449,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Nome</_name>
+          <name>Nome</name>
           <coordinates>64.501111 -165.406389</coordinates>
           <location>
             <name>Nome Airport</name>
@@ -29461,7 +29461,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Northway</_name>
+          <name>Northway</name>
           <coordinates>62.961667 -141.937222</coordinates>
           <location>
             <name>Northway Airport</name>
@@ -29473,7 +29473,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Nuiqsut</_name>
+          <name>Nuiqsut</name>
           <coordinates>70.217500 -150.976389</coordinates>
           <location>
             <name>Nuiqsut Airport</name>
@@ -29484,7 +29484,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Palmer</_name>
+          <name>Palmer</name>
           <coordinates>61.599722 -149.112778</coordinates>
           <location>
             <name>Palmer Municipal Airport</name>
@@ -29496,7 +29496,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Paxson</_name>
+          <name>Paxson</name>
           <coordinates>63.089722 -145.613056</coordinates>
           <location>
             <name>Paxson</name>
@@ -29508,7 +29508,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Petersburg</_name>
+          <name msgctxt="City in Alaska, United States">Petersburg</name>
           <coordinates>56.812500 -132.955556</coordinates>
           <location>
             <name>Petersburg</name>
@@ -29520,7 +29520,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Platinum</_name>
+          <name>Platinum</name>
           <coordinates>59.013056 -161.816389</coordinates>
           <location>
             <name>Cape Newenham, Cape Newenham LRRS Airport</name>
@@ -29531,7 +29531,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Point Hope</_name>
+          <name>Point Hope</name>
           <coordinates>68.347778 -166.808056</coordinates>
           <location>
             <name>Point Hope Airport</name>
@@ -29543,7 +29543,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Point Lay</_name>
+          <name>Point Lay</name>
           <coordinates>69.757500 -163.051111</coordinates>
           <location>
             <name>Point Lay LRRS Airport</name>
@@ -29555,7 +29555,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Port Alexander</_name>
+          <name>Port Alexander</name>
           <coordinates>56.249722 -134.644444</coordinates>
           <location>
             <name>Port Alexander Seaplane Base</name>
@@ -29567,7 +29567,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Port Alsworth</_name>
+          <name>Port Alsworth</name>
           <coordinates>60.202500 -154.312778</coordinates>
           <location>
             <name>Port Alsworth Airport</name>
@@ -29578,7 +29578,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Port Heiden</_name>
+          <name>Port Heiden</name>
           <coordinates>56.949167 -158.626944</coordinates>
           <location>
             <name>Port Heiden Airport</name>
@@ -29590,7 +29590,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Saint George</_name>
+          <name msgctxt="City in Alaska, United States">Saint George</name>
           <coordinates>56.600000 -169.541667</coordinates>
           <location>
             <name>St. George, St. George Airport</name>
@@ -29601,7 +29601,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Saint Marys</_name>
+          <name>Saint Marys</name>
           <coordinates>62.053056 -163.165833</coordinates>
           <location>
             <name>St. Mary's, St. Mary's Airport</name>
@@ -29613,7 +29613,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Saint Paul</_name>
+          <name>Saint Paul</name>
           <coordinates>57.122222 -170.275000</coordinates>
           <location>
             <name>St. Paul Island, St. Paul Island Airport</name>
@@ -29624,7 +29624,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Sand Point</_name>
+          <name>Sand Point</name>
           <coordinates>55.339722 -160.497222</coordinates>
           <location>
             <name>Sand Point</name>
@@ -29635,7 +29635,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Savoonga</_name>
+          <name>Savoonga</name>
           <coordinates>63.694167 -170.478889</coordinates>
           <location>
             <name>Savoonga Airport</name>
@@ -29646,7 +29646,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Scammon Bay</_name>
+          <name>Scammon Bay</name>
           <coordinates>61.842778 -165.581667</coordinates>
           <location>
             <name>Cape Romanzof, Cape Romanzof LRRS Airport</name>
@@ -29657,7 +29657,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Selawik</_name>
+          <name>Selawik</name>
           <coordinates>66.603889 -160.006944</coordinates>
           <location>
             <name>Selawik</name>
@@ -29669,7 +29669,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Seldovia</_name>
+          <name>Seldovia</name>
           <coordinates>59.438056 -151.711389</coordinates>
           <location>
             <name>Seldovia Airport</name>
@@ -29680,7 +29680,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Seward</_name>
+          <name>Seward</name>
           <coordinates>60.104167 -149.442222</coordinates>
           <location>
             <name>Seward</name>
@@ -29692,7 +29692,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Shishmaref</_name>
+          <name>Shishmaref</name>
           <coordinates>66.256667 -166.071944</coordinates>
           <location>
             <name>Shishmaref Airport</name>
@@ -29704,7 +29704,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Sitka</_name>
+          <name>Sitka</name>
           <coordinates>57.053056 -135.330000</coordinates>
           <location>
             <name>Sitka Airport</name>
@@ -29716,7 +29716,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Skagway</_name>
+          <name>Skagway</name>
           <coordinates>59.458333 -135.313889</coordinates>
           <location>
             <name>Skagway</name>
@@ -29728,7 +29728,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Sleetmute</_name>
+          <name>Sleetmute</name>
           <coordinates>61.702500 -157.169722</coordinates>
           <location>
             <name>Sleetmute</name>
@@ -29739,7 +29739,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Soldotna</_name>
+          <name>Soldotna</name>
           <coordinates>60.487778 -151.058333</coordinates>
           <location>
             <name>Soldotna</name>
@@ -29751,7 +29751,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name msgctxt="City in Alaska, United States">Sutton</_name>
+          <name msgctxt="City in Alaska, United States">Sutton</name>
           <coordinates>61.711389 -148.894167</coordinates>
           <location>
             <name>Sutton</name>
@@ -29761,7 +29761,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Takotna</_name>
+          <name>Takotna</name>
           <coordinates>62.988611 -156.064167</coordinates>
           <location>
             <name>Tatalina LRRS Airport</name>
@@ -29772,7 +29772,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Talkeetna</_name>
+          <name>Talkeetna</name>
           <coordinates>62.323889 -150.109444</coordinates>
           <location>
             <name>Talkeetna Airport</name>
@@ -29784,7 +29784,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Tanana</_name>
+          <name>Tanana</name>
           <coordinates>65.171944 -152.078889</coordinates>
           <location>
             <name>Calhoun Memorial Airport</name>
@@ -29796,7 +29796,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Tin City</_name>
+          <name>Tin City</name>
           <coordinates>65.558611 -167.948056</coordinates>
           <location>
             <name>Tin City Airways Facilities Sector</name>
@@ -29807,7 +29807,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Togiak</_name>
+          <name>Togiak</name>
           <coordinates>59.061944 -160.376389</coordinates>
           <location>
             <name>Togiac Village, Togiak Airport</name>
@@ -29819,7 +29819,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Unalakleet</_name>
+          <name>Unalakleet</name>
           <coordinates>63.873056 -160.788056</coordinates>
           <location>
             <name>Unalakleet</name>
@@ -29831,7 +29831,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Unalaska</_name>
+          <name>Unalaska</name>
           <coordinates>53.873611 -166.536667</coordinates>
           <location>
             <name>Unalaska Airport</name>
@@ -29843,7 +29843,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Valdez</_name>
+          <name>Valdez</name>
           <coordinates>61.130833 -146.348333</coordinates>
           <location>
             <name>Valdez</name>
@@ -29855,7 +29855,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Wainwright</_name>
+          <name>Wainwright</name>
           <coordinates>70.636944 -160.038333</coordinates>
           <location>
             <name>Wainwright Airport</name>
@@ -29867,7 +29867,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Wasilla</_name>
+          <name>Wasilla</name>
           <coordinates>61.581389 -149.439444</coordinates>
           <location>
             <name>Wasilla Airport</name>
@@ -29878,7 +29878,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Whittier</_name>
+          <name>Whittier</name>
           <coordinates>60.773056 -148.683889</coordinates>
           <location>
             <name>Whittier</name>
@@ -29896,7 +29896,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Willow</_name>
+          <name>Willow</name>
           <coordinates>61.747222 -150.037500</coordinates>
           <location>
             <name>Willow Airport</name>
@@ -29908,7 +29908,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Wrangell</_name>
+          <name>Wrangell</name>
           <coordinates>56.470833 -132.376667</coordinates>
           <location>
             <name>Wrangell</name>
@@ -29920,7 +29920,7 @@
         </city>
         <city>
           <!-- A city in Alaska in the United States -->
-          <_name>Yakutat</_name>
+          <name>Yakutat</name>
           <coordinates>59.546944 -139.727222</coordinates>
           <location>
             <name>Yakutat</name>
@@ -29933,12 +29933,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Arizona</_name>
+        <name>Arizona</name>
         <fips-code>US04</fips-code>
         <tz-hint>America/Phoenix</tz-hint>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Bullhead City</_name>
+          <name>Bullhead City</name>
           <coordinates>35.147777 -114.568298</coordinates>
           <location>
             <name>Laughlin / Bullhead International Airport</name>
@@ -29948,7 +29948,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Casa Grande</_name>
+          <name>Casa Grande</name>
           <coordinates>32.879502 -111.757352</coordinates>
           <location>
             <name>Casa Grande Municipal Airport</name>
@@ -29960,7 +29960,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name msgctxt="City in Arizona, United States">Chandler</_name>
+          <name msgctxt="City in Arizona, United States">Chandler</name>
           <coordinates>33.306160 -111.841250</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -29970,7 +29970,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Childs</_name>
+          <name>Childs</name>
           <coordinates>32.452835 -112.843488</coordinates>
           <location>
             <name>Gila Bend U. S. Army Airfield</name>
@@ -29982,7 +29982,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name msgctxt="City in Arizona, United States">Douglas</_name>
+          <name msgctxt="City in Arizona, United States">Douglas</name>
           <coordinates>31.344547 -109.545345</coordinates>
           <location>
             <name>Douglas Bisbee, Bisbee Douglas International Airport</name>
@@ -29994,7 +29994,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Flagstaff</_name>
+          <name>Flagstaff</name>
           <coordinates>35.198067 -111.651273</coordinates>
           <location>
             <name>Flagstaff Pulliam Airport</name>
@@ -30006,7 +30006,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Gilbert</_name>
+          <name>Gilbert</name>
           <coordinates>33.352826 -111.789027</coordinates>
           <location>
             <name>Chandler, Chandler Municipal Airport</name>
@@ -30016,7 +30016,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name msgctxt="City in Arizona, United States">Glendale</_name>
+          <name msgctxt="City in Arizona, United States">Glendale</name>
           <coordinates>33.538652 -112.185987</coordinates>
           <location>
             <name>Glendale Municipal Airport</name>
@@ -30026,7 +30026,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Goodyear</_name>
+          <name>Goodyear</name>
           <coordinates>33.435320 -112.358214</coordinates>
           <location>
             <name>Goodyear Municipal</name>
@@ -30038,7 +30038,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Grand Canyon</_name>
+          <name>Grand Canyon</name>
           <coordinates>36.054427 -112.139336</coordinates>
           <location>
             <name>Grand Canyon National Park Airport</name>
@@ -30050,7 +30050,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Kingman</_name>
+          <name>Kingman</name>
           <coordinates>35.189443 -114.053006</coordinates>
           <location>
             <name>Kingman Airport</name>
@@ -30062,7 +30062,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Mesa</_name>
+          <name>Mesa</name>
           <coordinates>33.422269 -111.822640</coordinates>
           <location>
             <name>Mesa / Falcon Field</name>
@@ -30081,7 +30081,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Nogales</_name>
+          <name>Nogales</name>
           <coordinates>31.340377 -110.934253</coordinates>
           <location>
             <name>Nogales International Airport</name>
@@ -30091,7 +30091,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Page</_name>
+          <name>Page</name>
           <coordinates>36.914722 -111.455833</coordinates>
           <location>
             <name>Page Municipal Airport</name>
@@ -30103,7 +30103,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name msgctxt="City in Arizona, United States">Peoria</_name>
+          <name msgctxt="City in Arizona, United States">Peoria</name>
           <coordinates>33.580596 -112.237378</coordinates>
           <location>
             <name>Glendale, Glendale Municipal Airport</name>
@@ -30113,7 +30113,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Phoenix</_name>
+          <name>Phoenix</name>
           <coordinates>33.448377 -112.074037</coordinates>
           <location>
             <name>Phoenix Sky Harbor International Airport</name>
@@ -30139,7 +30139,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Prescott</_name>
+          <name>Prescott</name>
           <coordinates>34.540024 -112.468502</coordinates>
           <location>
             <name>Love Field</name>
@@ -30151,7 +30151,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Safford</_name>
+          <name>Safford</name>
           <coordinates>32.833955 -109.707580</coordinates>
           <location>
             <name>Safford Municipal Airport</name>
@@ -30163,7 +30163,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Saint Johns</_name>
+          <name>Saint Johns</name>
           <coordinates>34.505870 -109.360933</coordinates>
           <location>
             <name>St. Johns, St. Johns Industrial Airpark</name>
@@ -30173,7 +30173,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Scottsdale</_name>
+          <name>Scottsdale</name>
           <coordinates>33.509210 -111.899033</coordinates>
           <location>
             <name>Scottsdale Airport</name>
@@ -30185,7 +30185,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Show Low</_name>
+          <name>Show Low</name>
           <coordinates>34.254208 -110.029833</coordinates>
           <location>
             <name>Show Low Regional Airport</name>
@@ -30197,7 +30197,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Sierra Vista</_name>
+          <name>Sierra Vista</name>
           <coordinates>31.554539 -110.303691</coordinates>
           <location>
             <name>Fort Huachuca, Libby AAF Ft Huachuca</name>
@@ -30209,7 +30209,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Tempe</_name>
+          <name>Tempe</name>
           <coordinates>33.414768 -111.909310</coordinates>
           <location>
             <name>Phoenix, Phoenix Sky Harbor International Airport</name>
@@ -30221,7 +30221,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Tucson</_name>
+          <name>Tucson</name>
           <coordinates>32.221743 -110.926479</coordinates>
           <location>
             <name>Davis-Monthan Air Force Base</name>
@@ -30240,7 +30240,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Window Rock</_name>
+          <name>Window Rock</name>
           <coordinates>35.680573 -109.052593</coordinates>
           <location>
             <name>Window Rock Airport</name>
@@ -30250,7 +30250,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Winslow</_name>
+          <name>Winslow</name>
           <coordinates>35.024187 -110.697357</coordinates>
           <location>
             <name>Winslow Municipal Airport</name>
@@ -30262,7 +30262,7 @@
         </city>
         <city>
           <!-- A city in Arizona in the United States -->
-          <_name>Yuma</_name>
+          <name>Yuma</name>
           <coordinates>32.725325 -114.624397</coordinates>
           <location>
             <name>Yuma, Marine Corps Air Station</name>
@@ -30275,12 +30275,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Arkansas</_name>
+        <name>Arkansas</name>
         <fips-code>US05</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Arkadelphia</_name>
+          <name>Arkadelphia</name>
           <coordinates>34.120929 -93.053784</coordinates>
           <location>
             <name>Dexter B Florence Memorial Field Airport</name>
@@ -30290,7 +30290,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Batesville</_name>
+          <name>Batesville</name>
           <coordinates>35.769799 -91.640972</coordinates>
           <location>
             <name>Batesville Regional Airport</name>
@@ -30302,7 +30302,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Bentonville</_name>
+          <name>Bentonville</name>
           <coordinates>36.372854 -94.208817</coordinates>
           <location>
             <name>Bentonville Municipal Airport / Louise M Thaden Field</name>
@@ -30314,7 +30314,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Blytheville</_name>
+          <name>Blytheville</name>
           <coordinates>35.927295 -89.918975</coordinates>
           <location>
             <name>Blytheville Municipal Airport</name>
@@ -30324,7 +30324,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Camden</_name>
+          <name>Camden</name>
           <coordinates>33.584558 -92.834329</coordinates>
           <location>
             <name>Camden / Harrell Field</name>
@@ -30334,7 +30334,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>De Queen</_name>
+          <name>De Queen</name>
           <coordinates>34.037892 -94.341317</coordinates>
           <location>
             <name>J Lynn Helms Sevier County Airport</name>
@@ -30344,7 +30344,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>El Dorado</_name>
+          <name>El Dorado</name>
           <coordinates>33.207630 -92.666267</coordinates>
           <location>
             <name>South Arkansas Regional at Goodwin Field Airport</name>
@@ -30356,7 +30356,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Fayetteville</_name>
+          <name msgctxt="City in Arkansas, United States">Fayetteville</name>
           <coordinates>36.062579 -94.157426</coordinates>
           <location>
             <name>Drake Field</name>
@@ -30368,7 +30368,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Flippin</_name>
+          <name>Flippin</name>
           <coordinates>36.278958 -92.597108</coordinates>
           <location>
             <name>Marion County Regional Airport</name>
@@ -30380,7 +30380,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Fort Smith</_name>
+          <name msgctxt="City in Arkansas, United States">Fort Smith</name>
           <coordinates>35.385924 -94.398548</coordinates>
           <location>
             <name>Fort Smith Regional Airport</name>
@@ -30391,7 +30391,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Harrison</_name>
+          <name>Harrison</name>
           <coordinates>36.229794 -93.107676</coordinates>
           <location>
             <name>Boone County Airport</name>
@@ -30403,7 +30403,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Hot Springs</_name>
+          <name msgctxt="City in Arkansas, United States">Hot Springs</name>
           <coordinates>34.503700 -93.055179</coordinates>
           <location>
             <name>Memorial Field Airport</name>
@@ -30415,7 +30415,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Jonesboro</_name>
+          <name>Jonesboro</name>
           <coordinates>35.842297 -90.704279</coordinates>
           <location>
             <name>Jonesboro Municipal Airport</name>
@@ -30427,7 +30427,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Little Rock</_name>
+          <name>Little Rock</name>
           <coordinates>34.746481 -92.289595</coordinates>
           <location>
             <name>Adams Field</name>
@@ -30446,7 +30446,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Mena</_name>
+          <name>Mena</name>
           <coordinates>34.586217 -94.239655</coordinates>
           <location>
             <name>Mena Intermountain Municipal Airport</name>
@@ -30456,7 +30456,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Monticello</_name>
+          <name msgctxt="City in Arkansas, United States">Monticello</name>
           <coordinates>33.628997 -91.790964</coordinates>
           <location>
             <name>Monticello Municipal Airport / Ellis Field</name>
@@ -30466,7 +30466,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Mount Ida</_name>
+          <name>Mount Ida</name>
           <coordinates>34.556764 -93.634081</coordinates>
           <location>
             <name>Mount Ida</name>
@@ -30476,7 +30476,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Mountain Home</_name>
+          <name msgctxt="City in Arkansas, United States">Mountain Home</name>
           <coordinates>36.335345 -92.385159</coordinates>
           <location>
             <name>Baxter County Regional Airport</name>
@@ -30486,7 +30486,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Newport</_name>
+          <name msgctxt="City in Arkansas, United States">Newport</name>
           <coordinates>35.604802 -91.281795</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -30496,7 +30496,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Pine Bluff</_name>
+          <name>Pine Bluff</name>
           <coordinates>34.228431 -92.003196</coordinates>
           <location>
             <name>Grider Field Airport</name>
@@ -30508,7 +30508,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Rogers</_name>
+          <name>Rogers</name>
           <coordinates>36.332020 -94.118537</coordinates>
           <location>
             <name>Rogers Municipal Airport-Carter Field</name>
@@ -30520,7 +30520,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Russellville</_name>
+          <name>Russellville</name>
           <coordinates>35.278417 -93.133786</coordinates>
           <location>
             <name>Russellville Regional Airport</name>
@@ -30530,7 +30530,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Searcy</_name>
+          <name>Searcy</name>
           <coordinates>35.250641 -91.736249</coordinates>
           <location>
             <name>Searcy Municipal Airport</name>
@@ -30540,7 +30540,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Siloam Springs</_name>
+          <name>Siloam Springs</name>
           <coordinates>36.188136 -94.540496</coordinates>
           <location>
             <name>Smith Field Airport</name>
@@ -30552,7 +30552,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Springdale</_name>
+          <name>Springdale</name>
           <coordinates>36.186744 -94.128814</coordinates>
           <location>
             <name>Springdale Municipal</name>
@@ -30569,7 +30569,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name msgctxt="City in Arkansas, United States">Stuttgart</_name>
+          <name msgctxt="City in Arkansas, United States">Stuttgart</name>
           <coordinates>34.500375 -91.552628</coordinates>
           <location>
             <name>Stuttgart Municipal Airport</name>
@@ -30581,7 +30581,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Texarkana</_name>
+          <name>Texarkana</name>
           <coordinates>33.441792 -94.037688</coordinates>
           <location>
             <name>Texarkana Regional-Webb Field</name>
@@ -30593,7 +30593,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>Walnut Ridge</_name>
+          <name>Walnut Ridge</name>
           <coordinates>36.068404 -90.955953</coordinates>
           <location>
             <name>Walnut Ridge Regional Airport</name>
@@ -30605,7 +30605,7 @@
         </city>
         <city>
           <!-- A city in Arkansas in the United States -->
-          <_name>West Memphis</_name>
+          <name>West Memphis</name>
           <coordinates>35.146480 -90.184539</coordinates>
           <location>
             <name>West Memphis Municipal Airport</name>
@@ -30616,12 +30616,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>California</_name>
+        <name>California</name>
         <fips-code>US06</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Alturas</_name>
+          <name>Alturas</name>
           <coordinates>41.487115 -120.542456</coordinates>
           <location>
             <name>Alturas</name>
@@ -30631,7 +30631,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Anaheim</_name>
+          <name>Anaheim</name>
           <coordinates>33.835293 -117.914504</coordinates>
           <location>
             <name>Fullerton, Fullerton Municipal Airport</name>
@@ -30643,7 +30643,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Arcata</_name>
+          <name>Arcata</name>
           <coordinates>40.866517 -124.082840</coordinates>
           <location>
             <name>Arcata / Eureka, Arcata Airport</name>
@@ -30655,7 +30655,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Auburn</_name>
+          <name msgctxt="City in California, United States">Auburn</name>
           <coordinates>38.896565 -121.076890</coordinates>
           <location>
             <name>Auburn Municipal Airport</name>
@@ -30665,7 +30665,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Avalon</_name>
+          <name>Avalon</name>
           <coordinates>33.342807 -118.327851</coordinates>
           <location>
             <name>Catalina Airport</name>
@@ -30676,7 +30676,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Bakersfield</_name>
+          <name>Bakersfield</name>
           <coordinates>35.373292 -119.018713</coordinates>
           <location>
             <name>Meadows Field Airport</name>
@@ -30688,7 +30688,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Berkeley</_name>
+          <name>Berkeley</name>
           <coordinates>37.871593 -122.272747</coordinates>
           <location>
             <name>Oakland, Metro Oakland International Airport</name>
@@ -30700,7 +30700,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Bishop</_name>
+          <name>Bishop</name>
           <coordinates>37.363540 -118.395110</coordinates>
           <location>
             <name>Bishop Airport</name>
@@ -30712,7 +30712,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Blythe</_name>
+          <name>Blythe</name>
           <coordinates>33.610302 -114.596346</coordinates>
           <location>
             <name>Blythe Airport</name>
@@ -30724,7 +30724,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Burbank</_name>
+          <name>Burbank</name>
           <coordinates>34.180839 -118.308966</coordinates>
           <location>
             <name>Burbank-Glendale-Pasadena Airport</name>
@@ -30736,7 +30736,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Camarillo</_name>
+          <name>Camarillo</name>
           <coordinates>34.216394 -119.037602</coordinates>
           <location>
             <name>Camarillo Airport</name>
@@ -30748,7 +30748,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Campo</_name>
+          <name>Campo</name>
           <coordinates>32.606449 -116.468905</coordinates>
           <location>
             <name>Campo</name>
@@ -30760,7 +30760,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Carlsbad</_name>
+          <name msgctxt="City in California, United States">Carlsbad</name>
           <coordinates>33.158093 -117.350594</coordinates>
           <location>
             <name>McClellan-Palomar Airport</name>
@@ -30772,7 +30772,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Chico</_name>
+          <name>Chico</name>
           <coordinates>39.728494 -121.837478</coordinates>
           <location>
             <name>Chico Municipal</name>
@@ -30784,7 +30784,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>China Lake</_name>
+          <name>China Lake</name>
           <coordinates>35.650789 -117.661730</coordinates>
           <location>
             <name>China Lake, Naval Air Facility</name>
@@ -30796,7 +30796,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Chino</_name>
+          <name>Chino</name>
           <coordinates>34.012235 -117.688944</coordinates>
           <location>
             <name>Chino Airport</name>
@@ -30808,7 +30808,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Chula Vista</_name>
+          <name>Chula Vista</name>
           <coordinates>32.640054 -117.084196</coordinates>
           <location>
             <name>Imperial Beach, Naval Auxiliary Landing Field</name>
@@ -30820,7 +30820,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Concord</_name>
+          <name msgctxt="City in California, United States">Concord</name>
           <coordinates>37.977978 -122.031073</coordinates>
           <location>
             <name>Buchanan Field</name>
@@ -30832,7 +30832,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Corona</_name>
+          <name msgctxt="City in California, United States">Corona</name>
           <coordinates>33.875293 -117.566438</coordinates>
           <location>
             <name>Chino, Chino Airport</name>
@@ -30844,7 +30844,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Costa Mesa</_name>
+          <name>Costa Mesa</name>
           <coordinates>33.641132 -117.918669</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -30856,7 +30856,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Crescent City</_name>
+          <name>Crescent City</name>
           <coordinates>41.755948 -124.201747</coordinates>
           <location>
             <name>Jack McNamara Field Airport</name>
@@ -30868,7 +30868,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Daggett</_name>
+          <name>Daggett</name>
           <coordinates>34.863319 -116.888092</coordinates>
           <location>
             <name>Barstow-Daggett Airport</name>
@@ -30880,7 +30880,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Daly City</_name>
+          <name>Daly City</name>
           <coordinates>37.705766 -122.461917</coordinates>
           <location>
             <name>San Francisco, San Francisco International Airport</name>
@@ -30892,7 +30892,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Edwards</_name>
+          <name>Edwards</name>
           <coordinates>34.926088 -117.935068</coordinates>
           <location>
             <name>Edwards Air Force Base</name>
@@ -30909,7 +30909,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>El Centro</_name>
+          <name>El Centro</name>
           <coordinates>32.792000 -115.563051</coordinates>
           <location>
             <name>El Centro, Naval Air Facility</name>
@@ -30921,7 +30921,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>El Monte</_name>
+          <name>El Monte</name>
           <coordinates>34.068621 -118.027567</coordinates>
           <location>
             <name>El Monte</name>
@@ -30933,7 +30933,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Emigrant Gap</_name>
+          <name>Emigrant Gap</name>
           <coordinates>39.296845 -120.672712</coordinates>
           <location>
             <name>Blue Canyon Nyack Airport</name>
@@ -30944,7 +30944,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Escondido</_name>
+          <name>Escondido</name>
           <coordinates>33.119207 -117.086421</coordinates>
           <location>
             <name>Carlsbad, McClellan-Palomar Airport</name>
@@ -30956,7 +30956,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Fairfield</_name>
+          <name msgctxt="City in California, United States">Fairfield</name>
           <coordinates>38.249358 -122.039966</coordinates>
           <location>
             <name>Fairfield / Travis Air Force Base</name>
@@ -30968,7 +30968,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Fontana</_name>
+          <name>Fontana</name>
           <coordinates>34.092233 -117.435048</coordinates>
           <location>
             <name>Ontario, Ontario International Airport</name>
@@ -30980,7 +30980,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Fremont</_name>
+          <name msgctxt="City in California, United States">Fremont</name>
           <coordinates>37.548270 -121.988572</coordinates>
           <location>
             <name>Palo Alto Airport</name>
@@ -30992,7 +30992,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Fresno</_name>
+          <name>Fresno</name>
           <coordinates>36.747727 -119.772366</coordinates>
           <location>
             <name>Fresno Air Terminal</name>
@@ -31004,7 +31004,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Fullerton</_name>
+          <name>Fullerton</name>
           <coordinates>33.870292 -117.925338</coordinates>
           <location>
             <name>Fullerton Municipal Airport</name>
@@ -31016,7 +31016,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Garden Grove</_name>
+          <name>Garden Grove</name>
           <coordinates>33.773905 -117.941448</coordinates>
           <location>
             <name>Los Alamitos U. S. Army Airfield</name>
@@ -31026,7 +31026,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Glendale</_name>
+          <name msgctxt="City in California, United States">Glendale</name>
           <coordinates>34.142508 -118.255075</coordinates>
           <location>
             <name>Burbank, Burbank-Glendale-Pasadena Airport</name>
@@ -31038,7 +31038,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Hanford</_name>
+          <name msgctxt="City in California, United States">Hanford</name>
           <coordinates>36.327450 -119.645684</coordinates>
           <location>
             <name>Hanford Municipal Airport</name>
@@ -31048,7 +31048,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Hawthorne</_name>
+          <name>Hawthorne</name>
           <coordinates>33.916403 -118.352575</coordinates>
           <location>
             <name>Hawthorne Municipal Airport</name>
@@ -31060,7 +31060,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Hayward</_name>
+          <name msgctxt="City in California, United States">Hayward</name>
           <coordinates>37.668821 -122.080796</coordinates>
           <location>
             <name>Hayward Air Terminal</name>
@@ -31072,7 +31072,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Huntington Beach</_name>
+          <name>Huntington Beach</name>
           <coordinates>33.660297 -117.999227</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -31084,7 +31084,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Imperial</_name>
+          <name msgctxt="City in California, United States">Imperial</name>
           <coordinates>32.847553 -115.569439</coordinates>
           <location>
             <name>Imperial County Airport</name>
@@ -31096,7 +31096,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Imperial Beach</_name>
+          <name>Imperial Beach</name>
           <coordinates>32.583944 -117.113085</coordinates>
           <location>
             <name>Naval Auxiliary Landing Field</name>
@@ -31108,7 +31108,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Inglewood</_name>
+          <name>Inglewood</name>
           <coordinates>33.961680 -118.353131</coordinates>
           <location>
             <name>Los Angeles, Los Angeles International Airport</name>
@@ -31120,7 +31120,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Inyokern</_name>
+          <name>Inyokern</name>
           <coordinates>35.646899 -117.812567</coordinates>
           <location>
             <name>Inyokern</name>
@@ -31132,7 +31132,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Irvine</_name>
+          <name>Irvine</name>
           <coordinates>33.669465 -117.823111</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -31144,7 +31144,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>La Verne</_name>
+          <name>La Verne</name>
           <coordinates>34.100843 -117.767836</coordinates>
           <location>
             <name>La Verne / Brackett</name>
@@ -31156,7 +31156,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Lancaster</_name>
+          <name msgctxt="City in California, United States">Lancaster</name>
           <coordinates>34.698041 -118.136739</coordinates>
           <location>
             <name>General William J. Fox Airfield Airport</name>
@@ -31168,7 +31168,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Lemoore</_name>
+          <name>Lemoore</name>
           <coordinates>36.300784 -119.782911</coordinates>
           <location>
             <name>Lemoore, Naval Air Station</name>
@@ -31180,7 +31180,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Livermore</_name>
+          <name>Livermore</name>
           <coordinates>37.681874 -121.768009</coordinates>
           <location>
             <name>Livermore Municipal Airport</name>
@@ -31192,7 +31192,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Lompoc</_name>
+          <name>Lompoc</name>
           <coordinates>34.639150 -120.457941</coordinates>
           <location>
             <name>Lompoc Airport</name>
@@ -31211,7 +31211,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Long Beach</_name>
+          <name>Long Beach</name>
           <coordinates>33.766962 -118.189235</coordinates>
           <location>
             <name>Long Beach Airport</name>
@@ -31223,7 +31223,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Los Alamitos</_name>
+          <name>Los Alamitos</name>
           <coordinates>33.803072 -118.072564</coordinates>
           <location>
             <name>Los Alamitos U. S. Army Airfield</name>
@@ -31233,7 +31233,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Los Angeles</_name>
+          <name>Los Angeles</name>
           <coordinates>34.052234 -118.243685</coordinates>
           <location>
             <name>Los Angeles / USC Campus Downtown</name>
@@ -31259,7 +31259,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Madera</_name>
+          <name>Madera</name>
           <coordinates>36.961336 -120.060718</coordinates>
           <location>
             <name>Madera Municipal Airport</name>
@@ -31269,7 +31269,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Marysville</_name>
+          <name msgctxt="City in California, United States">Marysville</name>
           <coordinates>39.145725 -121.591355</coordinates>
           <location>
             <name>Yuba County Airport</name>
@@ -31288,7 +31288,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Merced</_name>
+          <name>Merced</name>
           <coordinates>37.302163 -120.482968</coordinates>
           <location>
             <name>Merced Municipal Airport</name>
@@ -31305,7 +31305,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Modesto</_name>
+          <name>Modesto</name>
           <coordinates>37.639097 -120.996878</coordinates>
           <location>
             <name>Modesto City-County-Sham Field</name>
@@ -31317,7 +31317,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Montague</_name>
+          <name>Montague</name>
           <coordinates>41.728198 -122.527801</coordinates>
           <location>
             <name>Siskiyou County Airport</name>
@@ -31329,7 +31329,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Monterey</_name>
+          <name>Monterey</name>
           <coordinates>36.600238 -121.894676</coordinates>
           <location>
             <name>Monterey Peninsula Airport</name>
@@ -31341,7 +31341,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Mount Shasta</_name>
+          <name>Mount Shasta</name>
           <coordinates>41.309875 -122.310567</coordinates>
           <location>
             <name>Mount Shasta</name>
@@ -31353,7 +31353,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Mount Wilson</_name>
+          <name>Mount Wilson</name>
           <coordinates>34.226393 -118.066180</coordinates>
           <location>
             <name>Mount Wilson</name>
@@ -31365,7 +31365,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Mountain View</_name>
+          <name>Mountain View</name>
           <coordinates>37.386052 -122.083851</coordinates>
           <location>
             <name>Moffett Field</name>
@@ -31377,7 +31377,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Napa</_name>
+          <name>Napa</name>
           <coordinates>38.297137 -122.285529</coordinates>
           <location>
             <name>Napa County Airport</name>
@@ -31389,7 +31389,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Needles</_name>
+          <name>Needles</name>
           <coordinates>34.848060 -114.614131</coordinates>
           <location>
             <name>Needles Airport</name>
@@ -31401,7 +31401,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Newhall</_name>
+          <name>Newhall</name>
           <coordinates>34.384720 -118.530919</coordinates>
           <location>
             <name>Newhall</name>
@@ -31411,7 +31411,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Norwalk</_name>
+          <name>Norwalk</name>
           <coordinates>33.902237 -118.081733</coordinates>
           <location>
             <name>Fullerton, Fullerton Municipal Airport</name>
@@ -31423,7 +31423,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Oakland</_name>
+          <name>Oakland</name>
           <coordinates>37.804372 -122.270803</coordinates>
           <location>
             <name>Metro Oakland International Airport</name>
@@ -31435,7 +31435,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Oceanside</_name>
+          <name>Oceanside</name>
           <coordinates>33.195870 -117.379483</coordinates>
           <location>
             <name>Oceanside Municipal Airport</name>
@@ -31452,7 +31452,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Ontario</_name>
+          <name msgctxt="City in California, United States">Ontario</name>
           <coordinates>34.063344 -117.650888</coordinates>
           <location>
             <name>Ontario International Airport</name>
@@ -31464,7 +31464,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Orange</_name>
+          <name msgctxt="City in California, United States">Orange</name>
           <coordinates>33.787794 -117.853112</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -31476,7 +31476,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Oroville</_name>
+          <name>Oroville</name>
           <coordinates>39.513775 -121.556359</coordinates>
           <location>
             <name>Oroville Municipal Airport</name>
@@ -31486,7 +31486,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Oxnard</_name>
+          <name>Oxnard</name>
           <coordinates>34.197505 -119.177052</coordinates>
           <location>
             <name>Oxnard Airport</name>
@@ -31504,7 +31504,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Palm Springs</_name>
+          <name>Palm Springs</name>
           <coordinates>33.830296 -116.545292</coordinates>
           <location>
             <name>Palm Springs Regional Airport</name>
@@ -31521,7 +31521,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Palmdale</_name>
+          <name>Palmdale</name>
           <coordinates>34.579434 -118.116461</coordinates>
           <location>
             <name>Palmdale Production Flight Plant</name>
@@ -31533,7 +31533,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Palo Alto</_name>
+          <name>Palo Alto</name>
           <coordinates>37.441883 -122.143019</coordinates>
           <location>
             <name>Palo Alto Airport</name>
@@ -31545,7 +31545,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Pasadena</_name>
+          <name msgctxt="City in California, United States">Pasadena</name>
           <coordinates>34.147785 -118.144515</coordinates>
           <location>
             <name>Mount Wilson</name>
@@ -31557,7 +31557,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Paso Robles</_name>
+          <name>Paso Robles</name>
           <coordinates>35.626637 -120.691004</coordinates>
           <location>
             <name>Paso Robles Municipal Airport</name>
@@ -31569,7 +31569,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Pomona</_name>
+          <name>Pomona</name>
           <coordinates>34.055289 -117.752279</coordinates>
           <location>
             <name>La Verne / Brackett</name>
@@ -31581,7 +31581,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Porterville</_name>
+          <name>Porterville</name>
           <coordinates>36.065230 -119.016768</coordinates>
           <location>
             <name>Porterville Municipal Airport</name>
@@ -31593,7 +31593,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Ramona</_name>
+          <name>Ramona</name>
           <coordinates>33.041711 -116.868082</coordinates>
           <location>
             <name>Ramona Airport</name>
@@ -31603,7 +31603,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Rancho Cucamonga</_name>
+          <name>Rancho Cucamonga</name>
           <coordinates>34.106399 -117.593108</coordinates>
           <location>
             <name>Ontario, Ontario International Airport</name>
@@ -31615,7 +31615,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Red Bluff</_name>
+          <name>Red Bluff</name>
           <coordinates>40.178489 -122.235830</coordinates>
           <location>
             <name>Red Bluff Municipal Airport</name>
@@ -31627,7 +31627,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Redding</_name>
+          <name>Redding</name>
           <coordinates>40.586540 -122.391675</coordinates>
           <location>
             <name>Redding Municipal Airport</name>
@@ -31639,7 +31639,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Riverside</_name>
+          <name>Riverside</name>
           <coordinates>33.953349 -117.396156</coordinates>
           <location>
             <name>Riverside Municipal Airport</name>
@@ -31658,7 +31658,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Sacramento</_name>
+          <name>Sacramento</name>
           <coordinates>38.581572 -121.494400</coordinates>
           <location>
             <name>Sacramento Executive Airport</name>
@@ -31682,7 +31682,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Salinas</_name>
+          <name>Salinas</name>
           <coordinates>36.677737 -121.655501</coordinates>
           <location>
             <name>Salinas Municipal Airport</name>
@@ -31694,7 +31694,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Bernardino</_name>
+          <name>San Bernardino</name>
           <coordinates>34.108345 -117.289765</coordinates>
           <location>
             <name>Riverside, Riverside Municipal Airport</name>
@@ -31706,7 +31706,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Carlos</_name>
+          <name>San Carlos</name>
           <coordinates>37.507159 -122.260522</coordinates>
           <location>
             <name>San Carlos Airport</name>
@@ -31718,7 +31718,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Diego</_name>
+          <name>San Diego</name>
           <coordinates>32.715329 -117.157255</coordinates>
           <location>
             <name>San Diego International-Lindbergh Field</name>
@@ -31764,7 +31764,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Francisco</_name>
+          <name>San Francisco</name>
           <coordinates>37.774929 -122.419415</coordinates>
           <location>
             <name>San Francisco International Airport</name>
@@ -31776,7 +31776,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Jose</_name>
+          <name>San Jose</name>
           <coordinates>37.339386 -121.894955</coordinates>
           <location>
             <name>San Jose International Airport</name>
@@ -31793,7 +31793,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>San Luis Obispo</_name>
+          <name>San Luis Obispo</name>
           <coordinates>35.282752 -120.659616</coordinates>
           <location>
             <name>San Luis Obispo County-McChesney Field</name>
@@ -31805,7 +31805,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Sandberg</_name>
+          <name>Sandberg</name>
           <coordinates>34.741093 -118.709534</coordinates>
           <location>
             <name>Sandberg</name>
@@ -31816,7 +31816,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Santa Ana</_name>
+          <name>Santa Ana</name>
           <coordinates>33.745573 -117.867834</coordinates>
           <location>
             <name>John Wayne Airport-Orange County Airport</name>
@@ -31828,7 +31828,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Santa Barbara</_name>
+          <name>Santa Barbara</name>
           <coordinates>34.420831 -119.698190</coordinates>
           <location>
             <name>Santa Barbara Municipal Airport</name>
@@ -31840,7 +31840,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Santa Clara</_name>
+          <name msgctxt="City in California, United States">Santa Clara</name>
           <coordinates>37.354108 -121.955236</coordinates>
           <location>
             <name>San Jose, San Jose International Airport</name>
@@ -31852,7 +31852,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Santa Maria</_name>
+          <name msgctxt="City in California, United States">Santa Maria</name>
           <coordinates>34.953034 -120.435719</coordinates>
           <location>
             <name>Santa Maria Public Airport</name>
@@ -31864,7 +31864,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Santa Monica</_name>
+          <name>Santa Monica</name>
           <coordinates>34.019454 -118.491191</coordinates>
           <location>
             <name>Santa Monica Municipal Airport</name>
@@ -31876,7 +31876,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Santa Rosa</_name>
+          <name>Santa Rosa</name>
           <coordinates>38.440467 -122.714431</coordinates>
           <location>
             <name>Santa Rosa Sonoma County Airport</name>
@@ -31888,7 +31888,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Simi Valley</_name>
+          <name>Simi Valley</name>
           <coordinates>34.269447 -118.781482</coordinates>
           <location>
             <name>Newhall</name>
@@ -31898,7 +31898,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>South Lake Tahoe</_name>
+          <name>South Lake Tahoe</name>
           <coordinates>38.933241 -119.984348</coordinates>
           <location>
             <name>Lake Tahoe Airport</name>
@@ -31910,7 +31910,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name msgctxt="City in California, United States">Stockton</_name>
+          <name msgctxt="City in California, United States">Stockton</name>
           <coordinates>37.957702 -121.290780</coordinates>
           <location>
             <name>Stockton Metropolitan Airport</name>
@@ -31922,7 +31922,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Sunnyvale</_name>
+          <name>Sunnyvale</name>
           <coordinates>37.368830 -122.036350</coordinates>
           <location>
             <name>Mountain View, Moffett Field</name>
@@ -31934,7 +31934,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Thousand Oaks</_name>
+          <name>Thousand Oaks</name>
           <coordinates>34.170561 -118.837594</coordinates>
           <location>
             <name>Camarillo, Camarillo Airport</name>
@@ -31946,7 +31946,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Torrance</_name>
+          <name>Torrance</name>
           <coordinates>33.835849 -118.340629</coordinates>
           <location>
             <name>Zamperini Field Airport</name>
@@ -31958,7 +31958,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Truckee</_name>
+          <name>Truckee</name>
           <coordinates>39.327962 -120.183253</coordinates>
           <location>
             <name>Truckee-Tahoe</name>
@@ -31970,7 +31970,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Twentynine Palms</_name>
+          <name>Twentynine Palms</name>
           <coordinates>34.135558 -116.054169</coordinates>
           <location>
             <name>Twenty-Nine Palms, Marine Corps Air-Ground Combat Center</name>
@@ -31982,7 +31982,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Ukiah</_name>
+          <name>Ukiah</name>
           <coordinates>39.150171 -123.207783</coordinates>
           <location>
             <name>Ukiah Municipal Airport</name>
@@ -31992,7 +31992,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Vacaville</_name>
+          <name>Vacaville</name>
           <coordinates>38.356577 -121.987744</coordinates>
           <location>
             <name>Nut Tree Airport</name>
@@ -32002,7 +32002,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Vallejo</_name>
+          <name>Vallejo</name>
           <coordinates>38.104086 -122.256637</coordinates>
           <location>
             <name>Napa, Napa County Airport</name>
@@ -32014,7 +32014,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Van Nuys</_name>
+          <name>Van Nuys</name>
           <coordinates>34.186672 -118.448971</coordinates>
           <location>
             <name>Van Nuys Airport</name>
@@ -32026,7 +32026,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Ventura</_name>
+          <name>Ventura</name>
           <coordinates>34.278335 -119.293168</coordinates>
           <location>
             <name>Oxnard, Oxnard Airport</name>
@@ -32038,7 +32038,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Victorville</_name>
+          <name>Victorville</name>
           <coordinates>34.536107 -117.291156</coordinates>
           <location>
             <name>Southern California Logistics Airport</name>
@@ -32048,7 +32048,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Visalia</_name>
+          <name>Visalia</name>
           <coordinates>36.330228 -119.292058</coordinates>
           <location>
             <name>Visalia Municipal Airport</name>
@@ -32060,7 +32060,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>Watsonville</_name>
+          <name>Watsonville</name>
           <coordinates>36.910231 -121.756895</coordinates>
           <location>
             <name>Watsonville Municipal Airport</name>
@@ -32070,7 +32070,7 @@
         </city>
         <city>
           <!-- A city in California in the United States -->
-          <_name>West Covina</_name>
+          <name>West Covina</name>
           <coordinates>34.068621 -117.938953</coordinates>
           <location>
             <name>El Monte</name>
@@ -32083,12 +32083,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Colorado</_name>
+        <name>Colorado</name>
         <fips-code>US08</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Akron</_name>
+          <name msgctxt="City in Colorado, United States">Akron</name>
           <coordinates>40.160537 -103.214384</coordinates>
           <location>
             <name>Akron-Washington County Airport</name>
@@ -32098,7 +32098,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Alamosa</_name>
+          <name>Alamosa</name>
           <coordinates>37.469449 -105.870022</coordinates>
           <location>
             <name>San Luis Valley Regional Airport</name>
@@ -32110,7 +32110,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Arvada</_name>
+          <name>Arvada</name>
           <coordinates>39.802764 -105.087484</coordinates>
           <location>
             <name>Broomfield / Jeffco</name>
@@ -32122,7 +32122,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Aspen</_name>
+          <name>Aspen</name>
           <coordinates>39.191098 -106.817539</coordinates>
           <location>
             <name>Aspen-Pitkin County Airport</name>
@@ -32134,7 +32134,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Aurora</_name>
+          <name msgctxt="City in Colorado, United States">Aurora</name>
           <coordinates>39.729432 -104.831919</coordinates>
           <location>
             <name>Buckley Air Force Base Airport</name>
@@ -32146,7 +32146,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Broomfield</_name>
+          <name>Broomfield</name>
           <coordinates>39.920541 -105.086650</coordinates>
           <location>
             <name>Broomfield / Jeffco</name>
@@ -32169,7 +32169,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Burlington</_name>
+          <name msgctxt="City in Colorado, United States">Burlington</name>
           <coordinates>39.306108 -102.269356</coordinates>
           <location>
             <name>Carson County Airport</name>
@@ -32179,7 +32179,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Cardiff</_name>
+          <name msgctxt="City in Colorado, United States">Cardiff</name>
           <coordinates>39.506093 -107.310887</coordinates>
           <location>
             <name>Sunlight</name>
@@ -32189,7 +32189,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Colorado Springs</_name>
+          <name>Colorado Springs</name>
           <coordinates>38.833882 -104.821363</coordinates>
           <location>
             <name>City of Colorado Springs Municipal Airport</name>
@@ -32208,7 +32208,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Cortez</_name>
+          <name>Cortez</name>
           <coordinates>37.348883 -108.585926</coordinates>
           <location>
             <name>Cortez-Montezuma County Airport</name>
@@ -32220,7 +32220,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Craig</_name>
+          <name>Craig</name>
           <coordinates>40.515249 -107.546454</coordinates>
           <location>
             <name>Craig-Moffat Airport</name>
@@ -32232,7 +32232,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Denver</_name>
+          <name>Denver</name>
           <coordinates>39.739154 -104.984703</coordinates>
           <location>
             <name>Centennial Airport</name>
@@ -32256,7 +32256,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Durango</_name>
+          <name msgctxt="City in Colorado, United States">Durango</name>
           <coordinates>37.275280 -107.880067</coordinates>
           <location>
             <name>Durango-La Plata County Airport</name>
@@ -32268,7 +32268,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Eagle</_name>
+          <name msgctxt="City in Colorado, United States">Eagle</name>
           <coordinates>39.655263 -106.828651</coordinates>
           <location>
             <name>Eagle County Regional</name>
@@ -32280,7 +32280,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Elbert</_name>
+          <name>Elbert</name>
           <coordinates>39.219434 -104.537192</coordinates>
           <location>
             <name>Elbert Mountain, Monument Pass</name>
@@ -32290,7 +32290,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Fort Carson</_name>
+          <name>Fort Carson</name>
           <coordinates>38.737494 -104.788861</coordinates>
           <location>
             <name>Fort Carson</name>
@@ -32302,7 +32302,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Fort Collins</_name>
+          <name>Fort Collins</name>
           <coordinates>40.585260 -105.084423</coordinates>
           <location>
             <name>Fort Collins / Loveland, Fort Collins-Loveland Municipal Airport</name>
@@ -32314,7 +32314,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Grand Junction</_name>
+          <name>Grand Junction</name>
           <coordinates>39.063871 -108.550649</coordinates>
           <location>
             <name>Walker Field</name>
@@ -32326,7 +32326,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Gunnison</_name>
+          <name>Gunnison</name>
           <coordinates>38.545825 -106.925321</coordinates>
           <location>
             <name>Gunnison-Crested Butte Regional Airport</name>
@@ -32338,7 +32338,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Hayden</_name>
+          <name>Hayden</name>
           <coordinates>40.491918 -107.257558</coordinates>
           <location>
             <name>Yampa Valley Airport</name>
@@ -32350,7 +32350,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>La Junta</_name>
+          <name>La Junta</name>
           <coordinates>37.985009 -103.543832</coordinates>
           <location>
             <name>La Junta Municipal Airport</name>
@@ -32362,7 +32362,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>La Veta</_name>
+          <name>La Veta</name>
           <coordinates>37.505012 -105.007775</coordinates>
           <location>
             <name>La Veta Mountain, La Veta Pass</name>
@@ -32372,7 +32372,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Lakewood</_name>
+          <name>Lakewood</name>
           <coordinates>39.704709 -105.081373</coordinates>
           <location>
             <name>Broomfield / Jeffco</name>
@@ -32384,7 +32384,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Lamar</_name>
+          <name>Lamar</name>
           <coordinates>38.087231 -102.620750</coordinates>
           <location>
             <name>Lamar Municipal Airport</name>
@@ -32394,7 +32394,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Leadville</_name>
+          <name>Leadville</name>
           <coordinates>39.250823 -106.292524</coordinates>
           <location>
             <name>Lake County Airport</name>
@@ -32406,7 +32406,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Limon</_name>
+          <name>Limon</name>
           <coordinates>39.263876 -103.692174</coordinates>
           <location>
             <name>Limon Municipal Airport</name>
@@ -32418,7 +32418,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Meeker</_name>
+          <name>Meeker</name>
           <coordinates>40.037473 -107.913130</coordinates>
           <location>
             <name>Meeker Airport</name>
@@ -32428,7 +32428,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Montrose</_name>
+          <name>Montrose</name>
           <coordinates>38.478320 -107.876174</coordinates>
           <location>
             <name>Montrose Regional Airport</name>
@@ -32440,7 +32440,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Pagosa Springs</_name>
+          <name>Pagosa Springs</name>
           <coordinates>37.269450 -107.009762</coordinates>
           <location>
             <name>Pagosa Springs, Wolf Creek Pass</name>
@@ -32450,7 +32450,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Pueblo</_name>
+          <name>Pueblo</name>
           <coordinates>38.254447 -104.609141</coordinates>
           <location>
             <name>Pueblo Memorial Airport</name>
@@ -32462,7 +32462,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Rifle</_name>
+          <name>Rifle</name>
           <coordinates>39.534702 -107.783120</coordinates>
           <location>
             <name>Garfield County Regional Airport</name>
@@ -32472,7 +32472,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Saguache</_name>
+          <name>Saguache</name>
           <coordinates>38.087500 -106.141967</coordinates>
           <location>
             <name>Saguache Municipal Airport</name>
@@ -32482,7 +32482,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Salida</_name>
+          <name>Salida</name>
           <coordinates>38.534719 -105.998902</coordinates>
           <location>
             <name>Salida Mountain, Monarch Pass</name>
@@ -32492,7 +32492,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Springfield</_name>
+          <name msgctxt="City in Colorado, United States">Springfield</name>
           <coordinates>37.408349 -102.614362</coordinates>
           <location>
             <name>Springfield, Comanche National Grassland</name>
@@ -32502,7 +32502,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Steamboat Springs</_name>
+          <name>Steamboat Springs</name>
           <coordinates>40.484977 -106.831716</coordinates>
           <location>
             <name>Mount Werner</name>
@@ -32512,7 +32512,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Tarryall</_name>
+          <name>Tarryall</name>
           <coordinates>39.121935 -105.475555</coordinates>
           <location>
             <name>Wilkerson Pass</name>
@@ -32522,7 +32522,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Telluride</_name>
+          <name>Telluride</name>
           <coordinates>37.937494 -107.812285</coordinates>
           <location>
             <name>Telluride Regional Airport</name>
@@ -32532,7 +32532,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name msgctxt="City in Colorado, United States">Trinidad</_name>
+          <name msgctxt="City in Colorado, United States">Trinidad</name>
           <coordinates>37.169463 -104.500541</coordinates>
           <location>
             <name>Perry Stokes Airport</name>
@@ -32544,7 +32544,7 @@
         </city>
         <city>
           <!-- A city in Colorado in the United States -->
-          <_name>Westminster</_name>
+          <name>Westminster</name>
           <coordinates>39.836653 -105.037205</coordinates>
           <location>
             <name>Broomfield / Jeffco</name>
@@ -32557,12 +32557,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Connecticut</_name>
+        <name>Connecticut</name>
         <fips-code>US09</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Bridgeport</_name>
+          <name>Bridgeport</name>
           <coordinates>41.167041 -73.204835</coordinates>
           <location>
             <name>Sikorsky Memorial Airport</name>
@@ -32574,7 +32574,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Danbury</_name>
+          <name>Danbury</name>
           <coordinates>41.394817 -73.454011</coordinates>
           <location>
             <name>Danbury Municipal Airport</name>
@@ -32586,7 +32586,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Groton</_name>
+          <name>Groton</name>
           <coordinates>41.350098 -72.078409</coordinates>
           <location>
             <name>Groton / New London, Groton / New London Airport</name>
@@ -32598,7 +32598,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Hartford</_name>
+          <name>Hartford</name>
           <coordinates>41.763711 -72.685093</coordinates>
           <location>
             <name>Hartford-Brainard Airport</name>
@@ -32610,7 +32610,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Meriden</_name>
+          <name>Meriden</name>
           <coordinates>41.538153 -72.807044</coordinates>
           <location>
             <name>Meriden Markham Municipal Airport</name>
@@ -32620,7 +32620,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>New Haven</_name>
+          <name>New Haven</name>
           <coordinates>41.308153 -72.928158</coordinates>
           <location>
             <name>Tweed-New Haven Airport</name>
@@ -32632,7 +32632,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name msgctxt="City in Connecticut, United States">Oxford</_name>
+          <name msgctxt="City in Connecticut, United States">Oxford</name>
           <coordinates>41.433985 -73.116777</coordinates>
           <location>
             <name>Waterbury-Oxford Airport</name>
@@ -32644,7 +32644,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Stamford</_name>
+          <name>Stamford</name>
           <coordinates>41.053430 -73.538734</coordinates>
           <location>
             <name>White Plains, Westchester County Airport</name>
@@ -32656,7 +32656,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Waterbury</_name>
+          <name>Waterbury</name>
           <coordinates>41.558152 -73.051497</coordinates>
           <location>
             <name>Oxford, Waterbury-Oxford Airport</name>
@@ -32668,7 +32668,7 @@
         </city>
         <city>
           <!-- A city in Connecticut in the United States -->
-          <_name>Windsor Locks</_name>
+          <name>Windsor Locks</name>
           <coordinates>41.929264 -72.627312</coordinates>
           <location>
             <name>Bradley International Airport</name>
@@ -32681,12 +32681,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Delaware</_name>
+        <name>Delaware</name>
         <fips-code>US10</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Delaware in the United States -->
-          <_name>Dover</_name>
+          <name>Dover</name>
           <coordinates>39.158168 -75.524368</coordinates>
           <location>
             <name>Dover Air Force Base</name>
@@ -32698,7 +32698,7 @@
         </city>
         <city>
           <!-- A city in Delaware in the United States -->
-          <_name msgctxt="City in Delaware, United States">Georgetown</_name>
+          <name msgctxt="City in Delaware, United States">Georgetown</name>
           <coordinates>38.690113 -75.385473</coordinates>
           <location>
             <name>Sussex County Airport</name>
@@ -32708,7 +32708,7 @@
         </city>
         <city>
           <!-- A city in Delaware in the United States -->
-          <_name msgctxt="City in Delaware, United States">Wilmington</_name>
+          <name msgctxt="City in Delaware, United States">Wilmington</name>
           <coordinates>39.745947 -75.546589</coordinates>
           <location>
             <name>New Castle County Airport</name>
@@ -32721,12 +32721,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>District of Columbia</_name>
+        <name>District of Columbia</name>
         <fips-code>US11</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- The capital of the United States -->
-          <_name msgctxt="City in District of Columbia, United States">Washington</_name>
+          <name msgctxt="City in District of Columbia, United States">Washington</name>
           <coordinates>38.895112 -77.036366</coordinates>
           <location>
             <name>Washington DC, Reagan National Airport</name>
@@ -32746,12 +32746,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Florida</_name>
+        <name>Florida</name>
         <fips-code>US12</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Apalachicola</_name>
+          <name>Apalachicola</name>
           <coordinates>29.725767 -84.983244</coordinates>
           <location>
             <name>Apalachicola</name>
@@ -32761,7 +32761,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Bartow</_name>
+          <name>Bartow</name>
           <coordinates>27.896415 -81.843137</coordinates>
           <location>
             <name>Bartow Municipal</name>
@@ -32772,7 +32772,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Boca Raton</_name>
+          <name>Boca Raton</name>
           <coordinates>26.358688 -80.083098</coordinates>
           <location>
             <name>Boca Raton Airport</name>
@@ -32782,7 +32782,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Brooksville</_name>
+          <name>Brooksville</name>
           <coordinates>28.555272 -82.387871</coordinates>
           <location>
             <name>Hernando County Airport</name>
@@ -32794,7 +32794,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Cape Canaveral</_name>
+          <name>Cape Canaveral</name>
           <coordinates>28.405837 -80.604773</coordinates>
           <location>
             <name>Cocoa Beach, Cape Canaveral Air Force Station Skid Strip</name>
@@ -32804,7 +32804,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Cape Coral</_name>
+          <name>Cape Coral</name>
           <coordinates>26.562854 -81.949533</coordinates>
           <location>
             <name>Fort Myers, Page Field</name>
@@ -32816,7 +32816,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Clearwater</_name>
+          <name>Clearwater</name>
           <coordinates>27.965853 -82.800103</coordinates>
           <location>
             <name>St. Petersburg / Clearwater, St. Petersburg / Clearwater International Airport</name>
@@ -32828,7 +32828,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Cocoa</_name>
+          <name>Cocoa</name>
           <coordinates>28.386116 -80.741998</coordinates>
           <location>
             <name>Cocoa / Patrick Air Force Base</name>
@@ -32840,7 +32840,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Crestview</_name>
+          <name>Crestview</name>
           <coordinates>30.762133 -86.570508</coordinates>
           <location>
             <name>Sikes Airport</name>
@@ -32861,7 +32861,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Cross City</_name>
+          <name>Cross City</name>
           <coordinates>29.634398 -83.125131</coordinates>
           <location>
             <name>Cross City Airport</name>
@@ -32873,7 +32873,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Daytona Beach</_name>
+          <name>Daytona Beach</name>
           <coordinates>29.210815 -81.022833</coordinates>
           <location>
             <name>Daytona Beach Regional Airport</name>
@@ -32885,7 +32885,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Destin</_name>
+          <name>Destin</name>
           <coordinates>30.393534 -86.495783</coordinates>
           <location>
             <name>Destin-Ft. Walton Beach Airport</name>
@@ -32897,7 +32897,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Fort Lauderdale</_name>
+          <name>Fort Lauderdale</name>
           <coordinates>26.122308 -80.143379</coordinates>
           <location>
             <name>Fort Lauderdale / Hollywood International Airport</name>
@@ -32916,7 +32916,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Fort Myers</_name>
+          <name>Fort Myers</name>
           <coordinates>26.640628 -81.872308</coordinates>
           <location>
             <name>Page Field</name>
@@ -32935,7 +32935,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Fort Pierce</_name>
+          <name>Fort Pierce</name>
           <coordinates>27.446706 -80.325606</coordinates>
           <location>
             <name>St. Lucie County International Airport</name>
@@ -32945,7 +32945,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Fort Walton Beach</_name>
+          <name>Fort Walton Beach</name>
           <coordinates>30.405755 -86.618842</coordinates>
           <location>
             <name>Hurlburt Field</name>
@@ -32957,7 +32957,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Gainesville</_name>
+          <name msgctxt="City in Florida, United States">Gainesville</name>
           <coordinates>29.651634 -82.324826</coordinates>
           <location>
             <name>Gainesville Regional Airport</name>
@@ -32969,7 +32969,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Hialeah</_name>
+          <name>Hialeah</name>
           <coordinates>25.857596 -80.278106</coordinates>
           <location>
             <name>Miami, Opa Locka Airport</name>
@@ -32981,7 +32981,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Hollywood</_name>
+          <name>Hollywood</name>
           <coordinates>26.011201 -80.149490</coordinates>
           <location>
             <name>North Perry Airport</name>
@@ -32991,7 +32991,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Homestead</_name>
+          <name>Homestead</name>
           <coordinates>25.468722 -80.477557</coordinates>
           <location>
             <name>Homestead Air Force Base</name>
@@ -33003,7 +33003,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Jacksonville</_name>
+          <name msgctxt="City in Florida, United States">Jacksonville</name>
           <coordinates>30.332184 -81.655651</coordinates>
           <location>
             <name>Jacksonville, Naval Air Station</name>
@@ -33034,7 +33034,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Key West</_name>
+          <name>Key West</name>
           <coordinates>24.555702 -81.782591</coordinates>
           <location>
             <name>Key West International Airport</name>
@@ -33053,7 +33053,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Lakeland</_name>
+          <name>Lakeland</name>
           <coordinates>28.039465 -81.949804</coordinates>
           <location>
             <name>Lakeland Regional</name>
@@ -33065,7 +33065,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Leesburg</_name>
+          <name msgctxt="City in Florida, United States">Leesburg</name>
           <coordinates>28.810823 -81.877858</coordinates>
           <location>
             <name>Leesburg Regional Airport</name>
@@ -33076,7 +33076,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Marathon</_name>
+          <name>Marathon</name>
           <coordinates>24.713752 -81.090351</coordinates>
           <location>
             <name>Marathon Airport</name>
@@ -33088,7 +33088,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Marianna</_name>
+          <name>Marianna</name>
           <coordinates>30.774360 -85.226873</coordinates>
           <location>
             <name>Marianna Municipal Airport</name>
@@ -33101,7 +33101,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Mayport</_name>
+          <name>Mayport</name>
           <coordinates>30.393296 -81.430642</coordinates>
           <location>
             <name>Mayport Naval Station, Adm David L. McDonald Field</name>
@@ -33113,7 +33113,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Melbourne</_name>
+          <name msgctxt="City in Florida, United States">Melbourne</name>
           <coordinates>28.083627 -80.608109</coordinates>
           <location>
             <name>Melbourne International Airport</name>
@@ -33125,7 +33125,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Miami</_name>
+          <name msgctxt="City in Florida, United States">Miami</name>
           <coordinates>25.774266 -80.193659</coordinates>
           <location>
             <name>Miami International Airport</name>
@@ -33151,7 +33151,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Milton</_name>
+          <name>Milton</name>
           <coordinates>30.632415 -87.039688</coordinates>
           <location>
             <name>Milton, Whiting Field South</name>
@@ -33169,7 +33169,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Naples</_name>
+          <name msgctxt="City in Florida, United States">Naples</name>
           <coordinates>26.142036 -81.794810</coordinates>
           <location>
             <name>Naples Municipal Airport</name>
@@ -33181,7 +33181,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>New Smyrna Beach</_name>
+          <name>New Smyrna Beach</name>
           <coordinates>29.025819 -80.926998</coordinates>
           <location>
             <name>New Smyrna Beach Municipal Airport</name>
@@ -33191,7 +33191,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Ocala</_name>
+          <name>Ocala</name>
           <coordinates>29.187199 -82.140092</coordinates>
           <location>
             <name>Ocala International Airport-Jim Taylor Field</name>
@@ -33203,7 +33203,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Okeechobee</_name>
+          <name>Okeechobee</name>
           <coordinates>27.243935 -80.829783</coordinates>
           <location>
             <name>Okeechobee County Airport</name>
@@ -33213,7 +33213,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Orlando</_name>
+          <name>Orlando</name>
           <coordinates>28.538335 -81.379237</coordinates>
           <location>
             <name>Orlando Executive Airport</name>
@@ -33244,7 +33244,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Ormond Beach</_name>
+          <name>Ormond Beach</name>
           <coordinates>29.285813 -81.055889</coordinates>
           <location>
             <name>Ormond Beach Municipal Airport</name>
@@ -33254,7 +33254,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Panama City</_name>
+          <name>Panama City</name>
           <coordinates>30.158813 -85.660206</coordinates>
           <location>
             <name>Panama City-Bay County International Airport</name>
@@ -33267,7 +33267,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Pembroke Pines</_name>
+          <name>Pembroke Pines</name>
           <coordinates>26.003146 -80.223937</coordinates>
           <location>
             <name>Hollywood, North Perry Airport</name>
@@ -33277,7 +33277,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Pensacola</_name>
+          <name>Pensacola</name>
           <coordinates>30.421309 -87.216915</coordinates>
           <location>
             <name>Pensacola Regional Airport</name>
@@ -33298,7 +33298,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Perry</_name>
+          <name>Perry</name>
           <coordinates>30.117435 -83.581815</coordinates>
           <location>
             <name>Perry-Foley, Perry-Foley Airport</name>
@@ -33309,7 +33309,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Pompano Beach</_name>
+          <name>Pompano Beach</name>
           <coordinates>26.237860 -80.124767</coordinates>
           <location>
             <name>Pompano Beach Airpark</name>
@@ -33320,7 +33320,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Punta Gorda</_name>
+          <name>Punta Gorda</name>
           <coordinates>26.929784 -82.045366</coordinates>
           <location>
             <name>Charlotte County Airport</name>
@@ -33331,7 +33331,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Sarasota</_name>
+          <name>Sarasota</name>
           <coordinates>27.336435 -82.530653</coordinates>
           <location>
             <name>Sarasota / Bradenton, Sarasota-Bradenton International Airport</name>
@@ -33343,7 +33343,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Springfield</_name>
+          <name msgctxt="City in Florida, United States">Springfield</name>
           <coordinates>30.153257 -85.611315</coordinates>
           <location>
             <name>Tyndall Air Force Base</name>
@@ -33355,7 +33355,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Stuart</_name>
+          <name>Stuart</name>
           <coordinates>27.197548 -80.252826</coordinates>
           <location>
             <name>Witham Field Airport</name>
@@ -33365,7 +33365,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Tallahassee</_name>
+          <name>Tallahassee</name>
           <coordinates>30.438256 -84.280733</coordinates>
           <location>
             <name>Tallahassee Regional Airport</name>
@@ -33377,7 +33377,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Tampa</_name>
+          <name>Tampa</name>
           <coordinates>27.947522 -82.458428</coordinates>
           <location>
             <name>Peter O Knight Airport</name>
@@ -33413,7 +33413,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>The Villages</_name>
+          <name>The Villages</name>
           <coordinates>28.933596 -81.948417</coordinates>
           <location>
             <name>The Villages</name>
@@ -33423,7 +33423,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Titusville</_name>
+          <name>Titusville</name>
           <coordinates>28.612219 -80.807554</coordinates>
           <location>
             <name>Titusville, NASA Shuttle Landing Facility</name>
@@ -33441,7 +33441,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name msgctxt="City in Florida, United States">Valparaiso</_name>
+          <name msgctxt="City in Florida, United States">Valparaiso</name>
           <coordinates>30.508531 -86.502728</coordinates>
           <location>
             <name>Valparaiso / Eglin Air Force Base</name>
@@ -33454,7 +33454,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Vero Beach</_name>
+          <name>Vero Beach</name>
           <coordinates>27.638643 -80.397274</coordinates>
           <location>
             <name>Vero Beach Municipal Airport</name>
@@ -33466,7 +33466,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Vilano Beach</_name>
+          <name>Vilano Beach</name>
           <coordinates>29.918858 -81.292850</coordinates>
           <location>
             <name>St. Augustine, St. Augustine Airport</name>
@@ -33476,7 +33476,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>West Palm Beach</_name>
+          <name>West Palm Beach</name>
           <coordinates>26.715342 -80.053375</coordinates>
           <location>
             <name>Palm Beach International Airport</name>
@@ -33488,7 +33488,7 @@
         </city>
         <city>
           <!-- A city in Florida in the United States -->
-          <_name>Winter Haven</_name>
+          <name>Winter Haven</name>
           <coordinates>28.022243 -81.732857</coordinates>
           <location>
             <name>Winter Haven's Gilbert Airport</name>
@@ -33500,12 +33500,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name msgctxt="State in United States">Georgia</_name>
+        <name msgctxt="State in United States">Georgia</name>
         <fips-code>US13</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Albany</_name>
+          <name msgctxt="City in Georgia, United States">Albany</name>
           <coordinates>31.578507 -84.155741</coordinates>
           <location>
             <name>Southwest Georgia Regional Airport</name>
@@ -33517,7 +33517,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Alma</_name>
+          <name msgctxt="City in Georgia, United States">Alma</name>
           <coordinates>31.539370 -82.462356</coordinates>
           <location>
             <name>Bacon County Airport</name>
@@ -33529,7 +33529,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Athens</_name>
+          <name msgctxt="City in Georgia, United States">Athens</name>
           <coordinates>33.960948 -83.377936</coordinates>
           <location>
             <name>Athens Airport</name>
@@ -33541,7 +33541,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Atlanta</_name>
+          <name>Atlanta</name>
           <coordinates>33.748995 -84.387982</coordinates>
           <location>
             <name>Hartsfield - Jackson Atlanta International Airport</name>
@@ -33574,7 +33574,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Augusta</_name>
+          <name msgctxt="City in Georgia, United States">Augusta</name>
           <coordinates>33.470970 -81.974838</coordinates>
           <location>
             <name>Daniel Field</name>
@@ -33591,7 +33591,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Bainbridge</_name>
+          <name>Bainbridge</name>
           <coordinates>30.903800 -84.575470</coordinates>
           <location>
             <name>Decatur County Industrial Air Park Airport</name>
@@ -33601,7 +33601,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Barretts</_name>
+          <name>Barretts</name>
           <coordinates>31.001590 -83.199318</coordinates>
           <location>
             <name>Moody Air Force Base</name>
@@ -33613,7 +33613,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Brunswick</_name>
+          <name msgctxt="City in Georgia, United States">Brunswick</name>
           <coordinates>31.149953 -81.491489</coordinates>
           <location>
             <name>Malcolm McKinnon Airport</name>
@@ -33630,7 +33630,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Canton</_name>
+          <name>Canton</name>
           <coordinates>34.236762 -84.490762</coordinates>
           <location>
             <name>Cherokee County Airport</name>
@@ -33640,7 +33640,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Cartersville</_name>
+          <name>Cartersville</name>
           <coordinates>34.165097 -84.799938</coordinates>
           <location>
             <name>Cartersville Airport</name>
@@ -33650,7 +33650,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Columbus</_name>
+          <name msgctxt="City in Georgia, United States">Columbus</name>
           <coordinates>32.460976 -84.987709</coordinates>
           <location>
             <name>Columbus Metropolitan Airport</name>
@@ -33662,7 +33662,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Dalton</_name>
+          <name>Dalton</name>
           <coordinates>34.769802 -84.970223</coordinates>
           <location>
             <name>Dalton Municipal Airport</name>
@@ -33672,7 +33672,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Douglas</_name>
+          <name msgctxt="City in Georgia, United States">Douglas</name>
           <coordinates>31.508807 -82.849865</coordinates>
           <location>
             <name>Douglas Municipal Airport</name>
@@ -33682,7 +33682,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Dublin</_name>
+          <name msgctxt="City in Georgia, United States">Dublin</name>
           <coordinates>32.540445 -82.903754</coordinates>
           <location>
             <name>W H 'Bud' Barron Airport</name>
@@ -33692,7 +33692,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Fort Benning</_name>
+          <name>Fort Benning</name>
           <coordinates>32.352369 -84.968819</coordinates>
           <location>
             <name>Fort Benning</name>
@@ -33704,7 +33704,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Gainesville</_name>
+          <name msgctxt="City in Georgia, United States">Gainesville</name>
           <coordinates>34.297879 -83.824066</coordinates>
           <location>
             <name>Gilmer Memorial Airport</name>
@@ -33714,7 +33714,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Greensboro</_name>
+          <name msgctxt="City in Georgia, United States">Greensboro</name>
           <coordinates>33.575683 -83.182379</coordinates>
           <location>
             <name>Greene County Regional Airport</name>
@@ -33724,7 +33724,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Hinesville</_name>
+          <name>Hinesville</name>
           <coordinates>31.846877 -81.595945</coordinates>
           <location>
             <name>Ft. Stewart</name>
@@ -33736,7 +33736,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">La Grange</_name>
+          <name msgctxt="City in Georgia, United States">La Grange</name>
           <coordinates>33.039291 -85.031327</coordinates>
           <location>
             <name>Callaway Airport</name>
@@ -33746,7 +33746,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Lawrenceville</_name>
+          <name msgctxt="City in Georgia, United States">Lawrenceville</name>
           <coordinates>33.956215 -83.987962</coordinates>
           <location>
             <name>Gwinnett County-Briscoe Field Airport</name>
@@ -33756,7 +33756,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Macon</_name>
+          <name>Macon</name>
           <coordinates>32.840695 -83.632402</coordinates>
           <location>
             <name>Middle Georgia Regional Airport</name>
@@ -33768,7 +33768,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Marietta</_name>
+          <name>Marietta</name>
           <coordinates>33.952602 -84.549933</coordinates>
           <location>
             <name>Marietta / Dobbins Air Force Base</name>
@@ -33785,7 +33785,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Milledgeville</_name>
+          <name>Milledgeville</name>
           <coordinates>33.080143 -83.232099</coordinates>
           <location>
             <name>Baldwin County Airport</name>
@@ -33795,7 +33795,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Moultrie</_name>
+          <name>Moultrie</name>
           <coordinates>31.179908 -83.789063</coordinates>
           <location>
             <name>Moultrie Municipal Airport</name>
@@ -33806,7 +33806,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Newnan</_name>
+          <name>Newnan</name>
           <coordinates>33.380672 -84.799657</coordinates>
           <location>
             <name>Newnan Coweta County Airport</name>
@@ -33816,7 +33816,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name msgctxt="City in Georgia, United States">Rome</_name>
+          <name msgctxt="City in Georgia, United States">Rome</name>
           <coordinates>34.257038 -85.164673</coordinates>
           <location>
             <name>R. B. Russell Airport</name>
@@ -33828,7 +33828,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Savannah</_name>
+          <name>Savannah</name>
           <coordinates>32.083541 -81.099834</coordinates>
           <location>
             <name>Hunter U. S. Army Airfield</name>
@@ -33847,7 +33847,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Statesboro</_name>
+          <name>Statesboro</name>
           <coordinates>32.448788 -81.783167</coordinates>
           <location>
             <name>Statesboro-Bulloch County Airport</name>
@@ -33857,7 +33857,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Sylvania</_name>
+          <name>Sylvania</name>
           <coordinates>32.750444 -81.636776</coordinates>
           <location>
             <name>Sylvania, Plantation Airpark</name>
@@ -33867,7 +33867,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Thomaston</_name>
+          <name>Thomaston</name>
           <coordinates>32.888188 -84.326585</coordinates>
           <location>
             <name>Thomaston-Upson County Airport</name>
@@ -33877,7 +33877,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Thomson</_name>
+          <name>Thomson</name>
           <coordinates>33.470693 -82.504573</coordinates>
           <location>
             <name>Thomson-McDuffie County Airport</name>
@@ -33887,7 +33887,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Valdosta</_name>
+          <name>Valdosta</name>
           <coordinates>30.832702 -83.278485</coordinates>
           <location>
             <name>Valdosta Regional Airport</name>
@@ -33899,7 +33899,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Vidalia</_name>
+          <name>Vidalia</name>
           <coordinates>32.217686 -82.413461</coordinates>
           <location>
             <name>Vidalia Municipal Airport</name>
@@ -33909,7 +33909,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Warner Robins</_name>
+          <name>Warner Robins</name>
           <coordinates>32.620978 -83.599905</coordinates>
           <location>
             <name>Warner Robins Air Force Base</name>
@@ -33921,7 +33921,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Waycross</_name>
+          <name>Waycross</name>
           <coordinates>31.213551 -82.354018</coordinates>
           <location>
             <name>Waycross / Ware County, Ga</name>
@@ -33933,7 +33933,7 @@
         </city>
         <city>
           <!-- A city in Georgia in the United States -->
-          <_name>Winder</_name>
+          <name>Winder</name>
           <coordinates>33.992610 -83.720171</coordinates>
           <location>
             <name>Winder-Barrow Airport</name>
@@ -33944,12 +33944,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Hawaii</_name>
+        <name>Hawaii</name>
         <fips-code>US15</fips-code>
         <tz-hint>Pacific/Honolulu</tz-hint>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Hilo</_name>
+          <name>Hilo</name>
           <coordinates>19.729722 -155.090000</coordinates>
           <location>
             <name>Hilo International Airport</name>
@@ -33961,7 +33961,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Honolulu</_name>
+          <name>Honolulu</name>
           <coordinates>21.306944 -157.858333</coordinates>
           <location>
             <name>Honolulu International Airport</name>
@@ -33985,7 +33985,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Kahului</_name>
+          <name>Kahului</name>
           <coordinates>20.894722 -156.470000</coordinates>
           <location>
             <name>Kahului Airport</name>
@@ -33997,7 +33997,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Kailua</_name>
+          <name>Kailua</name>
           <coordinates>19.640556 -155.995556</coordinates>
           <location>
             <name>Kailua / Kona, Keahole Airport</name>
@@ -34009,7 +34009,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Kaumalapau</_name>
+          <name>Kaumalapau</name>
           <coordinates>20.790000 -156.990000</coordinates>
           <location>
             <name>Lanai City, Lanai Airport</name>
@@ -34021,7 +34021,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Kaunakakai</_name>
+          <name>Kaunakakai</name>
           <coordinates>21.093333 -157.023889</coordinates>
           <location>
             <name>Molokai Airport</name>
@@ -34033,7 +34033,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Kekaha</_name>
+          <name>Kekaha</name>
           <coordinates>21.970833 -159.715000</coordinates>
           <location>
             <name>Kekaha, Pacific Missile Test Facility Barking Sands</name>
@@ -34044,7 +34044,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Lahaina</_name>
+          <name>Lahaina</name>
           <coordinates>20.878333 -156.682500</coordinates>
           <location>
             <name>Lahaina / West Maui</name>
@@ -34056,7 +34056,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Lihue</_name>
+          <name>Lihue</name>
           <coordinates>21.981111 -159.371111</coordinates>
           <location>
             <name>Lihue Airport</name>
@@ -34068,7 +34068,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Wahiawā</_name>
+          <name>Wahiawā</name>
           <coordinates>21.502778 -158.023611</coordinates>
           <location>
             <name>Wheeler Air Force Base / Oahu</name>
@@ -34080,7 +34080,7 @@
         </city>
         <city>
           <!-- A city in Hawaii in the United States -->
-          <_name>Waiki‘i</_name>
+          <name>Waiki‘i</name>
           <coordinates>19.860556 -155.652222</coordinates>
           <location>
             <name>Bradshaw Army Air Field / Hawaii</name>
@@ -34092,12 +34092,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Idaho</_name>
+        <name>Idaho</name>
         <fips-code>US16</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Boise</_name>
+          <name>Boise</name>
           <coordinates>43.613500 -116.203451</coordinates>
           <location>
             <name>Boise Air Terminal</name>
@@ -34109,7 +34109,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Burley</_name>
+          <name>Burley</name>
           <coordinates>42.535743 -113.792795</coordinates>
           <location>
             <name>Burley Municipal Airport</name>
@@ -34121,7 +34121,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Caldwell</_name>
+          <name msgctxt="City in Idaho, United States">Caldwell</name>
           <coordinates>43.662938 -116.687360</coordinates>
           <location>
             <name>Caldwell Industrial Airport</name>
@@ -34131,7 +34131,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Challis</_name>
+          <name>Challis</name>
           <coordinates>44.504644 -114.231731</coordinates>
           <location>
             <name>Challis Airport</name>
@@ -34141,7 +34141,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Coeur d'Alene</_name>
+          <name>Coeur d'Alene</name>
           <coordinates>47.677683 -116.780466</coordinates>
           <location>
             <name>Coeur d'Alene Air Terminal</name>
@@ -34154,7 +34154,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Hailey</_name>
+          <name>Hailey</name>
           <coordinates>43.519629 -114.315325</coordinates>
           <location>
             <name>Friedman Memorial Airport</name>
@@ -34166,7 +34166,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Idaho Falls</_name>
+          <name>Idaho Falls</name>
           <coordinates>43.466581 -112.034137</coordinates>
           <location>
             <name>Fanning Field</name>
@@ -34178,7 +34178,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Jerome</_name>
+          <name>Jerome</name>
           <coordinates>42.724073 -114.518653</coordinates>
           <location>
             <name>Jerome County Airport</name>
@@ -34188,7 +34188,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Lewiston</_name>
+          <name>Lewiston</name>
           <coordinates>46.416551 -117.017657</coordinates>
           <location>
             <name>Lewiston-Nez Perce County Airport</name>
@@ -34201,7 +34201,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Lowell</_name>
+          <name msgctxt="City in Idaho, United States">Lowell</name>
           <coordinates>46.144073 -115.595690</coordinates>
           <location>
             <name>Lowell</name>
@@ -34214,7 +34214,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Malta</_name>
+          <name msgctxt="City in Idaho, United States">Malta</name>
           <coordinates>42.306302 -113.369168</coordinates>
           <location>
             <name>Malta</name>
@@ -34226,7 +34226,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>McCall</_name>
+          <name>McCall</name>
           <coordinates>44.911006 -116.098736</coordinates>
           <location>
             <name>McCall Airport</name>
@@ -34238,7 +34238,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Moscow</_name>
+          <name msgctxt="City in Idaho, United States">Moscow</name>
           <coordinates>46.732388 -117.000165</coordinates>
           <location>
             <name>Pullman / Moscow, Pullman / Moscow Regional Airport</name>
@@ -34250,7 +34250,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Mountain Home</_name>
+          <name msgctxt="City in Idaho, United States">Mountain Home</name>
           <coordinates>43.132950 -115.691198</coordinates>
           <location>
             <name>Mountain Home Air Force Base</name>
@@ -34262,7 +34262,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Mullan</_name>
+          <name>Mullan</name>
           <coordinates>47.470208 -115.801825</coordinates>
           <location>
             <name>Mullan Pass, Mullan Pass Vor</name>
@@ -34273,7 +34273,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Pocatello</_name>
+          <name>Pocatello</name>
           <coordinates>42.871303 -112.445534</coordinates>
           <location>
             <name>Pocatello Regional Airport</name>
@@ -34285,7 +34285,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Rexburg</_name>
+          <name>Rexburg</name>
           <coordinates>43.826023 -111.789688</coordinates>
           <location>
             <name>Rexburg-Madison County Airport</name>
@@ -34295,7 +34295,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Salmon</_name>
+          <name>Salmon</name>
           <coordinates>45.175755 -113.895901</coordinates>
           <location>
             <name>Lemhi County Airport</name>
@@ -34307,7 +34307,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Sandpoint</_name>
+          <name>Sandpoint</name>
           <coordinates>48.276590 -116.553248</coordinates>
           <location>
             <name>Sandpoint Airport</name>
@@ -34318,7 +34318,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Soda Springs</_name>
+          <name>Soda Springs</name>
           <coordinates>42.654365 -111.604669</coordinates>
           <location>
             <name>Soda Springs / Tigert</name>
@@ -34330,7 +34330,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name msgctxt="City in Idaho, United States">Stanley</_name>
+          <name msgctxt="City in Idaho, United States">Stanley</name>
           <coordinates>44.211297 -114.945918</coordinates>
           <location>
             <name>Stanley Ranger Station</name>
@@ -34340,7 +34340,7 @@
         </city>
         <city>
           <!-- A city in Idaho in the United States -->
-          <_name>Twin Falls</_name>
+          <name>Twin Falls</name>
           <coordinates>42.562967 -114.460871</coordinates>
           <location>
             <name>Joslin Field-Magic Valley Regional Airport</name>
@@ -34353,12 +34353,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Illinois</_name>
+        <name>Illinois</name>
         <fips-code>US17</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Alton</_name>
+          <name>Alton</name>
           <coordinates>38.890604 -90.184276</coordinates>
           <location>
             <name>Alton / St. Louis, St. Louis Regional Airport</name>
@@ -34370,7 +34370,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Aurora</_name>
+          <name msgctxt="City in Illinois, United States">Aurora</name>
           <coordinates>41.760585 -88.320071</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -34382,7 +34382,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Belleville</_name>
+          <name>Belleville</name>
           <coordinates>38.520050 -89.983993</coordinates>
           <location>
             <name>Scott Air Force Base / MidAmerica Airport</name>
@@ -34394,7 +34394,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Bloomington</_name>
+          <name msgctxt="City in Illinois, United States">Bloomington</name>
           <coordinates>40.484203 -88.993687</coordinates>
           <location>
             <name>Bloomington / Normal, Central Illinois Regional Airport at Bloomington-Normal</name>
@@ -34406,7 +34406,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Cahokia</_name>
+          <name>Cahokia</name>
           <coordinates>38.570885 -90.190111</coordinates>
           <location>
             <name>Cahokia / St. Louis, St. Louis Downtown Airport</name>
@@ -34418,7 +34418,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Cairo</_name>
+          <name msgctxt="City in Illinois, United States">Cairo</name>
           <coordinates>37.005329 -89.176461</coordinates>
           <location>
             <name>Cairo Regional Airport</name>
@@ -34430,7 +34430,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Carbondale</_name>
+          <name>Carbondale</name>
           <coordinates>37.727273 -89.216750</coordinates>
           <location>
             <name>Carbondale / Murphysboro, Southern Illinois Airport</name>
@@ -34442,7 +34442,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Carmi</_name>
+          <name>Carmi</name>
           <coordinates>38.090880 -88.158649</coordinates>
           <location>
             <name>Carmi Municipal Airport</name>
@@ -34452,7 +34452,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Centralia</_name>
+          <name>Centralia</name>
           <coordinates>38.525049 -89.133404</coordinates>
           <location>
             <name>Centralia Municipal Airport</name>
@@ -34462,7 +34462,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Champaign</_name>
+          <name>Champaign</name>
           <coordinates>40.116420 -88.243383</coordinates>
           <location>
             <name>Champaign / Urbana, University of Illinois-Willard Airport</name>
@@ -34474,7 +34474,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Chicago</_name>
+          <name>Chicago</name>
           <coordinates>41.850033 -87.650052</coordinates>
           <location>
             <name>Chicago Midway Airport</name>
@@ -34514,7 +34514,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Danville</_name>
+          <name msgctxt="City in Illinois, United States">Danville</name>
           <coordinates>40.124481 -87.630021</coordinates>
           <location>
             <name>Vermilion County Airport</name>
@@ -34526,7 +34526,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>DeKalb</_name>
+          <name>DeKalb</name>
           <coordinates>41.929474 -88.750365</coordinates>
           <location>
             <name>DeKalb Taylor Municipal Airport</name>
@@ -34536,7 +34536,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Decatur</_name>
+          <name msgctxt="City in Illinois, United States">Decatur</name>
           <coordinates>39.840315 -88.954800</coordinates>
           <location>
             <name>Decatur Airport</name>
@@ -34548,7 +34548,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Effingham</_name>
+          <name>Effingham</name>
           <coordinates>39.120042 -88.543383</coordinates>
           <location>
             <name>Effingham County Memorial Airport</name>
@@ -34558,7 +34558,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Fairfield</_name>
+          <name msgctxt="City in Illinois, United States">Fairfield</name>
           <coordinates>38.378937 -88.359768</coordinates>
           <location>
             <name>Fairfield Municipal Airport</name>
@@ -34568,7 +34568,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Flora</_name>
+          <name>Flora</name>
           <coordinates>38.668936 -88.485604</coordinates>
           <location>
             <name>Flora Municipal Airport</name>
@@ -34578,7 +34578,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Freeport</_name>
+          <name msgctxt="City in Illinois, United States">Freeport</name>
           <coordinates>42.296686 -89.621227</coordinates>
           <location>
             <name>Albertus Airport</name>
@@ -34588,7 +34588,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Galesburg</_name>
+          <name>Galesburg</name>
           <coordinates>40.947816 -90.371240</coordinates>
           <location>
             <name>Galesburg Municipal Airport</name>
@@ -34600,7 +34600,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Grafton</_name>
+          <name>Grafton</name>
           <coordinates>38.970048 -90.431505</coordinates>
           <location>
             <name>St. Charles, St. Charles County Smartt Airport</name>
@@ -34611,7 +34611,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Harrisburg</_name>
+          <name msgctxt="City in Illinois, United States">Harrisburg</name>
           <coordinates>37.738381 -88.540607</coordinates>
           <location>
             <name>Harrisburg-Raleigh Airport</name>
@@ -34621,7 +34621,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Jacksonville</_name>
+          <name msgctxt="City in Illinois, United States">Jacksonville</name>
           <coordinates>39.733936 -90.229010</coordinates>
           <location>
             <name>Jacksonville Municipal Airport</name>
@@ -34631,7 +34631,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Joliet</_name>
+          <name>Joliet</name>
           <coordinates>41.525031 -88.081725</coordinates>
           <location>
             <name>Joliet Regional Airport</name>
@@ -34641,7 +34641,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Kankakee</_name>
+          <name>Kankakee</name>
           <coordinates>41.120033 -87.861153</coordinates>
           <location>
             <name>Greater Kankakee Airport</name>
@@ -34651,7 +34651,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Lacon</_name>
+          <name>Lacon</name>
           <coordinates>41.024758 -89.411201</coordinates>
           <location>
             <name>Marshall County Airport</name>
@@ -34661,7 +34661,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Lawrenceville</_name>
+          <name msgctxt="City in Illinois, United States">Lawrenceville</name>
           <coordinates>38.729214 -87.681693</coordinates>
           <location>
             <name>Lawrenceville-Vincennes International Airport</name>
@@ -34671,7 +34671,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Lincoln</_name>
+          <name msgctxt="City in Illinois, United States">Lincoln</name>
           <coordinates>40.148377 -89.364818</coordinates>
           <location>
             <name>Logan County Airport</name>
@@ -34681,7 +34681,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Litchfield</_name>
+          <name msgctxt="City in Illinois, United States">Litchfield</name>
           <coordinates>39.175326 -89.654258</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -34691,7 +34691,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Macomb</_name>
+          <name>Macomb</name>
           <coordinates>40.459208 -90.671797</coordinates>
           <location>
             <name>Macomb Municipal Airport</name>
@@ -34701,7 +34701,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Marion</_name>
+          <name msgctxt="City in Illinois, United States">Marion</name>
           <coordinates>37.730605 -88.933126</coordinates>
           <location>
             <name>Williamson County Regional Airport</name>
@@ -34713,7 +34713,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Mattoon</_name>
+          <name>Mattoon</name>
           <coordinates>39.483090 -88.372826</coordinates>
           <location>
             <name>Mattoon / Charleston, Coles County Memorial Airport</name>
@@ -34725,7 +34725,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Metropolis</_name>
+          <name>Metropolis</name>
           <coordinates>37.151165 -88.731998</coordinates>
           <location>
             <name>Metropolis Municipal Airport</name>
@@ -34735,7 +34735,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Moline</_name>
+          <name>Moline</name>
           <coordinates>41.506700 -90.515134</coordinates>
           <location>
             <name>Quad-City Airport</name>
@@ -34747,7 +34747,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Morris</_name>
+          <name msgctxt="City in Illinois, United States">Morris</name>
           <coordinates>41.357254 -88.421178</coordinates>
           <location>
             <name>Morris Municipal-James R Washburn Field Airport</name>
@@ -34757,7 +34757,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Mount Carmel</_name>
+          <name>Mount Carmel</name>
           <coordinates>38.410880 -87.761417</coordinates>
           <location>
             <name>Mount Carmel Municipal Airport</name>
@@ -34767,7 +34767,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Mount Vernon</_name>
+          <name>Mount Vernon</name>
           <coordinates>38.317271 -88.903120</coordinates>
           <location>
             <name>Mount Vernon Airport</name>
@@ -34779,7 +34779,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Naperville</_name>
+          <name>Naperville</name>
           <coordinates>41.785863 -88.147289</coordinates>
           <location>
             <name>Chicago / West Chicago, Dupage Airport</name>
@@ -34791,7 +34791,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Olney</_name>
+          <name>Olney</name>
           <coordinates>38.730881 -88.085315</coordinates>
           <location>
             <name>Olney-Noble, Olney-Noble Airport</name>
@@ -34801,7 +34801,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Paris</_name>
+          <name msgctxt="City in Illinois, United States">Paris</name>
           <coordinates>39.611146 -87.696137</coordinates>
           <location>
             <name>Edgar County Airport</name>
@@ -34811,7 +34811,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Peoria</_name>
+          <name msgctxt="City in Illinois, United States">Peoria</name>
           <coordinates>40.693649 -89.588986</coordinates>
           <location>
             <name>Greater Peoria Regional Airport</name>
@@ -34823,7 +34823,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Peru</_name>
+          <name msgctxt="City in Illinois, United States">Peru</name>
           <coordinates>41.327535 -89.128973</coordinates>
           <location>
             <name>Illinois Valley Regional-Walter A Duncan Field Airport</name>
@@ -34833,7 +34833,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Pittsfield</_name>
+          <name msgctxt="City in Illinois, United States">Pittsfield</name>
           <coordinates>39.607825 -90.805129</coordinates>
           <location>
             <name>Pittsfield Penstone Municipal Airport</name>
@@ -34843,7 +34843,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Pontiac</_name>
+          <name msgctxt="City in Illinois, United States">Pontiac</name>
           <coordinates>40.880867 -88.629784</coordinates>
           <location>
             <name>Pontiac Municipal Airport</name>
@@ -34853,7 +34853,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Quincy</_name>
+          <name>Quincy</name>
           <coordinates>39.935602 -91.409873</coordinates>
           <location>
             <name>Quincy Regional-Baldwin Field Airport</name>
@@ -34865,7 +34865,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Rantoul</_name>
+          <name>Rantoul</name>
           <coordinates>40.308367 -88.155879</coordinates>
           <location>
             <name>Rantoul National Aviation Center Airport-Frank Elliott Field</name>
@@ -34875,7 +34875,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Robinson</_name>
+          <name>Robinson</name>
           <coordinates>39.005320 -87.739194</coordinates>
           <location>
             <name>Robinson Municipal Airport</name>
@@ -34885,7 +34885,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Rochelle</_name>
+          <name>Rochelle</name>
           <coordinates>41.923918 -89.068707</coordinates>
           <location>
             <name>Rochelle Municipal-Koritz Field Airport</name>
@@ -34895,7 +34895,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Rockford</_name>
+          <name>Rockford</name>
           <coordinates>42.271131 -89.093995</coordinates>
           <location>
             <name>Greater Rockford Airport</name>
@@ -34907,7 +34907,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Salem</_name>
+          <name msgctxt="City in Illinois, United States">Salem</name>
           <coordinates>38.626993 -88.945616</coordinates>
           <location>
             <name>Salem-Leckrone Airport</name>
@@ -34917,7 +34917,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Savanna</_name>
+          <name>Savanna</name>
           <coordinates>42.094467 -90.156794</coordinates>
           <location>
             <name>Tri-Township Airport</name>
@@ -34927,7 +34927,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Sparta</_name>
+          <name msgctxt="City in Illinois, United States">Sparta</name>
           <coordinates>38.123105 -89.701766</coordinates>
           <location>
             <name>Sparta Community-Hunter Field Airport</name>
@@ -34937,7 +34937,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name msgctxt="City in Illinois, United States">Springfield</_name>
+          <name msgctxt="City in Illinois, United States">Springfield</name>
           <coordinates>39.801717 -89.643711</coordinates>
           <location>
             <name>Abraham Lincoln Capital Airport</name>
@@ -34949,7 +34949,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Sterling</_name>
+          <name>Sterling</name>
           <coordinates>41.788642 -89.696219</coordinates>
           <location>
             <name>Sterling Rockfalls</name>
@@ -34959,7 +34959,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Taylorville</_name>
+          <name>Taylorville</name>
           <coordinates>39.548935 -89.294533</coordinates>
           <location>
             <name>Taylorville Municipal Airport</name>
@@ -34969,7 +34969,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>Waukegan</_name>
+          <name>Waukegan</name>
           <coordinates>42.363633 -87.844794</coordinates>
           <location>
             <name>Chicago / Waukegan, Waukegan Regional Airport</name>
@@ -34981,7 +34981,7 @@
         </city>
         <city>
           <!-- A city in Illinois in the United States -->
-          <_name>West Chicago</_name>
+          <name>West Chicago</name>
           <coordinates>41.884751 -88.203961</coordinates>
           <location>
             <name>Chicago / West Chicago, Dupage Airport</name>
@@ -34994,12 +34994,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name msgctxt="State in United States">Indiana</_name>
+        <name msgctxt="State in United States">Indiana</name>
         <fips-code>US18</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Anderson</_name>
+          <name msgctxt="City in Indiana, United States">Anderson</name>
           <coordinates>40.105320 -85.680254</coordinates>
           <location>
             <name>Anderson Municipal</name>
@@ -35009,7 +35009,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Bloomington</_name>
+          <name msgctxt="City in Indiana, United States">Bloomington</name>
           <coordinates>39.165325 -86.526386</coordinates>
           <location>
             <name>Monroe County Airport</name>
@@ -35021,7 +35021,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Columbus</_name>
+          <name msgctxt="City in Indiana, United States">Columbus</name>
           <coordinates>39.201440 -85.921380</coordinates>
           <location>
             <name>Columbus / Bakalar</name>
@@ -35031,7 +35031,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Elkhart</_name>
+          <name msgctxt="City in Indiana, United States">Elkhart</name>
           <coordinates>41.681993 -85.976667</coordinates>
           <location>
             <name>Elkhart Municipal</name>
@@ -35043,7 +35043,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Evansville</_name>
+          <name>Evansville</name>
           <coordinates>37.974764 -87.555848</coordinates>
           <location>
             <name>Evansville Regional Airport</name>
@@ -35056,7 +35056,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Fort Wayne</_name>
+          <name>Fort Wayne</name>
           <coordinates>41.130604 -85.128860</coordinates>
           <location>
             <name>Fort Wayne International Airport</name>
@@ -35068,7 +35068,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Gary</_name>
+          <name>Gary</name>
           <coordinates>41.593370 -87.346427</coordinates>
           <location>
             <name>Gary Regional</name>
@@ -35081,7 +35081,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Goshen</_name>
+          <name>Goshen</name>
           <coordinates>41.582272 -85.834438</coordinates>
           <location>
             <name>Goshen Municipal Airport</name>
@@ -35091,7 +35091,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Indianapolis</_name>
+          <name>Indianapolis</name>
           <coordinates>39.768377 -86.158042</coordinates>
           <location>
             <name>Indianapolis International Airport</name>
@@ -35108,7 +35108,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Kokomo</_name>
+          <name>Kokomo</name>
           <coordinates>40.486427 -86.133603</coordinates>
           <location>
             <name>Kokomo Municipal Airport</name>
@@ -35118,7 +35118,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Lafayette</_name>
+          <name msgctxt="City in Indiana, United States">Lafayette</name>
           <coordinates>40.416702 -86.875287</coordinates>
           <location>
             <name>Purdue University Airport</name>
@@ -35130,7 +35130,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Muncie</_name>
+          <name>Muncie</name>
           <coordinates>40.193377 -85.386360</coordinates>
           <location>
             <name>Delaware County-Johnson Field</name>
@@ -35142,7 +35142,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Peru</_name>
+          <name msgctxt="City in Indiana, United States">Peru</name>
           <coordinates>40.753653 -86.068881</coordinates>
           <location>
             <name>Grissom Air Force Base / Peru</name>
@@ -35154,7 +35154,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Shelbyville</_name>
+          <name>Shelbyville</name>
           <coordinates>39.521437 -85.776924</coordinates>
           <location>
             <name>Shelbyville Municipal Airport</name>
@@ -35164,7 +35164,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>South Bend</_name>
+          <name>South Bend</name>
           <coordinates>41.683381 -86.250007</coordinates>
           <location>
             <name>South Bend Regional Airport</name>
@@ -35176,7 +35176,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name>Terre Haute</_name>
+          <name>Terre Haute</name>
           <coordinates>39.466703 -87.413909</coordinates>
           <location>
             <name>Terre Haute International Airport - Hulman Field</name>
@@ -35188,7 +35188,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Valparaiso</_name>
+          <name msgctxt="City in Indiana, United States">Valparaiso</name>
           <coordinates>41.473095 -87.061141</coordinates>
           <location>
             <name>Porter County Municipal Airport</name>
@@ -35199,7 +35199,7 @@
         </city>
         <city>
           <!-- A city in Indiana in the United States -->
-          <_name msgctxt="City in Indiana, United States">Warsaw</_name>
+          <name msgctxt="City in Indiana, United States">Warsaw</name>
           <coordinates>41.238100 -85.853047</coordinates>
           <location>
             <name>Warsaw Municipal Airport</name>
@@ -35210,12 +35210,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Iowa</_name>
+        <name>Iowa</name>
         <fips-code>US19</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Ames</_name>
+          <name>Ames</name>
           <coordinates>42.034708 -93.619940</coordinates>
           <location>
             <name>Ames Municipal Airport</name>
@@ -35227,7 +35227,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Ankeny</_name>
+          <name>Ankeny</name>
           <coordinates>41.729710 -93.605773</coordinates>
           <location>
             <name>Ankeny Regional Airport</name>
@@ -35237,7 +35237,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Atlantic</_name>
+          <name msgctxt="City in Iowa, United States">Atlantic</name>
           <coordinates>41.403601 -95.013878</coordinates>
           <location>
             <name>Atlantic</name>
@@ -35249,7 +35249,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Audubon</_name>
+          <name>Audubon</name>
           <coordinates>41.718042 -94.932487</coordinates>
           <location>
             <name>Audubon County Airport</name>
@@ -35259,7 +35259,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Boone</_name>
+          <name msgctxt="City in Iowa, United States">Boone</name>
           <coordinates>42.059705 -93.880227</coordinates>
           <location>
             <name>Boone Municipal</name>
@@ -35271,7 +35271,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Burlington</_name>
+          <name msgctxt="City in Iowa, United States">Burlington</name>
           <coordinates>40.807539 -91.112923</coordinates>
           <location>
             <name>Burlington Regional Airport</name>
@@ -35283,7 +35283,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Carroll</_name>
+          <name>Carroll</name>
           <coordinates>42.065818 -94.866930</coordinates>
           <location>
             <name>Carroll</name>
@@ -35295,7 +35295,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Cedar Rapids</_name>
+          <name>Cedar Rapids</name>
           <coordinates>42.008333 -91.644068</coordinates>
           <location>
             <name>The Eastern Iowa Airport</name>
@@ -35307,7 +35307,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Chariton</_name>
+          <name>Chariton</name>
           <coordinates>41.013889 -93.306598</coordinates>
           <location>
             <name>Chariton</name>
@@ -35319,7 +35319,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Charles City</_name>
+          <name>Charles City</name>
           <coordinates>43.066361 -92.672411</coordinates>
           <location>
             <name>Charles City</name>
@@ -35331,7 +35331,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Cherokee</_name>
+          <name>Cherokee</name>
           <coordinates>42.749428 -95.551674</coordinates>
           <location>
             <name>Cherokee Municipal Airport</name>
@@ -35341,7 +35341,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Clarinda</_name>
+          <name>Clarinda</name>
           <coordinates>40.741935 -95.038313</coordinates>
           <location>
             <name>Clarinda</name>
@@ -35353,7 +35353,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Clarion</_name>
+          <name>Clarion</name>
           <coordinates>42.731639 -93.732992</coordinates>
           <location>
             <name>Clarion</name>
@@ -35365,7 +35365,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Clinton</_name>
+          <name msgctxt="City in Iowa, United States">Clinton</name>
           <coordinates>41.844473 -90.188738</coordinates>
           <location>
             <name>Clinton Municipal Airport</name>
@@ -35377,7 +35377,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Council Bluffs</_name>
+          <name>Council Bluffs</name>
           <coordinates>41.261943 -95.861123</coordinates>
           <location>
             <name>Council Bluffs</name>
@@ -35389,7 +35389,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Creston</_name>
+          <name msgctxt="City in Iowa, United States">Creston</name>
           <coordinates>41.058600 -94.361347</coordinates>
           <location>
             <name>Creston</name>
@@ -35401,7 +35401,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Davenport</_name>
+          <name>Davenport</name>
           <coordinates>41.523644 -90.577637</coordinates>
           <location>
             <name>Davenport Municipal Airport</name>
@@ -35413,7 +35413,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Decorah</_name>
+          <name>Decorah</name>
           <coordinates>43.303306 -91.785709</coordinates>
           <location>
             <name>Decorah</name>
@@ -35425,7 +35425,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Denison</_name>
+          <name>Denison</name>
           <coordinates>42.017766 -95.355276</coordinates>
           <location>
             <name>Denison</name>
@@ -35437,7 +35437,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Des Moines</_name>
+          <name>Des Moines</name>
           <coordinates>41.600545 -93.609106</coordinates>
           <location>
             <name>Des Moines International Airport</name>
@@ -35449,7 +35449,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Dubuque</_name>
+          <name>Dubuque</name>
           <coordinates>42.500558 -90.664572</coordinates>
           <location>
             <name>Dubuque Regional Airport</name>
@@ -35461,7 +35461,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Estherville</_name>
+          <name>Estherville</name>
           <coordinates>43.401626 -94.832764</coordinates>
           <location>
             <name>Estherville Municipal Airport</name>
@@ -35473,7 +35473,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Fairfield</_name>
+          <name msgctxt="City in Iowa, United States">Fairfield</name>
           <coordinates>41.008631 -91.962673</coordinates>
           <location>
             <name>Fairfield</name>
@@ -35485,7 +35485,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Fort Dodge</_name>
+          <name>Fort Dodge</name>
           <coordinates>42.497469 -94.168016</coordinates>
           <location>
             <name>Fort Dodge</name>
@@ -35497,7 +35497,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Fort Madison</_name>
+          <name>Fort Madison</name>
           <coordinates>40.629763 -91.315151</coordinates>
           <location>
             <name>Fort Madison</name>
@@ -35509,7 +35509,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Harlan</_name>
+          <name>Harlan</name>
           <coordinates>41.653044 -95.325554</coordinates>
           <location>
             <name>Harlan Municipal Airport</name>
@@ -35519,7 +35519,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Iowa City</_name>
+          <name>Iowa City</name>
           <coordinates>41.661128 -91.530168</coordinates>
           <location>
             <name>Iowa City Municipal Airport</name>
@@ -35531,7 +35531,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Keokuk</_name>
+          <name>Keokuk</name>
           <coordinates>40.397266 -91.384874</coordinates>
           <location>
             <name>Keokuk Municipal</name>
@@ -35542,7 +35542,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Knoxville</_name>
+          <name msgctxt="City in Iowa, United States">Knoxville</name>
           <coordinates>41.320830 -93.109371</coordinates>
           <location>
             <name>Knoxville</name>
@@ -35553,7 +35553,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Lamoni</_name>
+          <name>Lamoni</name>
           <coordinates>40.622777 -93.934116</coordinates>
           <location>
             <name>Lamoni Municipal Airport</name>
@@ -35565,7 +35565,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Le Mars</_name>
+          <name>Le Mars</name>
           <coordinates>42.794157 -96.165578</coordinates>
           <location>
             <name>Le Mars Municipal Airport</name>
@@ -35576,7 +35576,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Marshalltown</_name>
+          <name>Marshalltown</name>
           <coordinates>42.049432 -92.907977</coordinates>
           <location>
             <name>Marshalltown Municipal Airport</name>
@@ -35588,7 +35588,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Mason City</_name>
+          <name>Mason City</name>
           <coordinates>43.153573 -93.201037</coordinates>
           <location>
             <name>Mason City Municipal Airport</name>
@@ -35600,7 +35600,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Monticello</_name>
+          <name msgctxt="City in Iowa, United States">Monticello</name>
           <coordinates>42.238335 -91.187094</coordinates>
           <location>
             <name>Monticello Municipal</name>
@@ -35612,7 +35612,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Mount Pleasant</_name>
+          <name msgctxt="City in Iowa, United States">Mount Pleasant</name>
           <coordinates>40.963640 -91.557938</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -35622,7 +35622,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Muscatine</_name>
+          <name>Muscatine</name>
           <coordinates>41.424473 -91.043205</coordinates>
           <location>
             <name>Muscatine</name>
@@ -35634,7 +35634,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Oelwein</_name>
+          <name>Oelwein</name>
           <coordinates>42.673317 -91.913504</coordinates>
           <location>
             <name>Oelwein Municipal Airport</name>
@@ -35646,7 +35646,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Orange City</_name>
+          <name>Orange City</name>
           <coordinates>43.007209 -96.058352</coordinates>
           <location>
             <name>Orange City</name>
@@ -35658,7 +35658,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Oskaloosa</_name>
+          <name>Oskaloosa</name>
           <coordinates>41.296395 -92.644359</coordinates>
           <location>
             <name>Oskaloosa Municipal Airport</name>
@@ -35668,7 +35668,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Ottumwa</_name>
+          <name>Ottumwa</name>
           <coordinates>41.020015 -92.411296</coordinates>
           <location>
             <name>Ottumwa Industrial Airport</name>
@@ -35680,7 +35680,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Pella</_name>
+          <name>Pella</name>
           <coordinates>41.408053 -92.916309</coordinates>
           <location>
             <name>Pella Municipal Airport</name>
@@ -35690,7 +35690,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Red Oak</_name>
+          <name>Red Oak</name>
           <coordinates>41.009715 -95.225547</coordinates>
           <location>
             <name>Red Oak</name>
@@ -35702,7 +35702,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Sheldon</_name>
+          <name>Sheldon</name>
           <coordinates>43.181089 -95.856128</coordinates>
           <location>
             <name>Sheldon</name>
@@ -35712,7 +35712,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Shenandoah</_name>
+          <name>Shenandoah</name>
           <coordinates>40.765553 -95.372210</coordinates>
           <location>
             <name>Shenandoah Municipal</name>
@@ -35724,7 +35724,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Sioux City</_name>
+          <name>Sioux City</name>
           <coordinates>42.499994 -96.400307</coordinates>
           <location>
             <name>Sioux Gateway Airport</name>
@@ -35736,7 +35736,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Spencer</_name>
+          <name>Spencer</name>
           <coordinates>43.141358 -95.144439</coordinates>
           <location>
             <name>Spencer Municipal Airport</name>
@@ -35748,7 +35748,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Storm Lake</_name>
+          <name>Storm Lake</name>
           <coordinates>42.641092 -95.209718</coordinates>
           <location>
             <name>Storm Lake</name>
@@ -35760,7 +35760,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Vinton</_name>
+          <name>Vinton</name>
           <coordinates>42.168606 -92.023514</coordinates>
           <location>
             <name>Vinton Veterans Memorial Airpark Airport</name>
@@ -35770,7 +35770,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Washington</_name>
+          <name msgctxt="City in Iowa, United States">Washington</name>
           <coordinates>41.299184 -91.692945</coordinates>
           <location>
             <name>Washington</name>
@@ -35782,7 +35782,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name msgctxt="City in Iowa, United States">Waterloo</_name>
+          <name msgctxt="City in Iowa, United States">Waterloo</name>
           <coordinates>42.492764 -92.342963</coordinates>
           <location>
             <name>Waterloo Municipal Airport</name>
@@ -35794,7 +35794,7 @@
         </city>
         <city>
           <!-- A city in Iowa in the United States -->
-          <_name>Webster City</_name>
+          <name>Webster City</name>
           <coordinates>42.469418 -93.816054</coordinates>
           <location>
             <name>Webster City</name>
@@ -35806,12 +35806,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Kansas</_name>
+        <name>Kansas</name>
         <fips-code>US20</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Chanute</_name>
+          <name>Chanute</name>
           <coordinates>37.679214 -95.457203</coordinates>
           <location>
             <name>Chanute Martin Johnson Airport</name>
@@ -35823,7 +35823,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Coffeyville</_name>
+          <name>Coffeyville</name>
           <coordinates>37.037301 -95.616366</coordinates>
           <location>
             <name>Coffeyville Municipal Airport</name>
@@ -35833,7 +35833,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Concordia</_name>
+          <name>Concordia</name>
           <coordinates>39.570835 -97.662540</coordinates>
           <location>
             <name>Blosser Municipal Airport</name>
@@ -35845,7 +35845,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Dodge City</_name>
+          <name>Dodge City</name>
           <coordinates>37.752798 -100.017079</coordinates>
           <location>
             <name>Dodge City Regional Airport</name>
@@ -35857,7 +35857,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Elkhart</_name>
+          <name msgctxt="City in Kansas, United States">Elkhart</name>
           <coordinates>37.008079 -101.890166</coordinates>
           <location>
             <name>Elkhart-Morton County Airport</name>
@@ -35867,7 +35867,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Elwood</_name>
+          <name>Elwood</name>
           <coordinates>39.755550 -94.872466</coordinates>
           <location>
             <name>St. Joseph, Rosecrans Memorial Airport</name>
@@ -35879,7 +35879,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Emporia</_name>
+          <name msgctxt="City in Kansas, United States">Emporia</name>
           <coordinates>38.403903 -96.181663</coordinates>
           <location>
             <name>Emporia Municipal Airport</name>
@@ -35891,7 +35891,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Garden City</_name>
+          <name msgctxt="City in Kansas, United States">Garden City</name>
           <coordinates>37.971690 -100.872662</coordinates>
           <location>
             <name>Garden City Regional Airport</name>
@@ -35903,7 +35903,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Goodland</_name>
+          <name>Goodland</name>
           <coordinates>39.350833 -101.710172</coordinates>
           <location>
             <name>Renner Field</name>
@@ -35916,7 +35916,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Great Bend</_name>
+          <name>Great Bend</name>
           <coordinates>38.364457 -98.764807</coordinates>
           <location>
             <name>Great Bend Municipal Airport</name>
@@ -35926,7 +35926,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Hays</_name>
+          <name>Hays</name>
           <coordinates>38.879178 -99.326770</coordinates>
           <location>
             <name>Hays Regional Airport</name>
@@ -35938,7 +35938,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Hill City</_name>
+          <name>Hill City</name>
           <coordinates>39.364728 -99.842065</coordinates>
           <location>
             <name>Hill City Municipal Airport</name>
@@ -35950,7 +35950,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Hutchinson</_name>
+          <name msgctxt="City in Kansas, United States">Hutchinson</name>
           <coordinates>38.060845 -97.929774</coordinates>
           <location>
             <name>Hutchinson Municipal Airport</name>
@@ -35962,7 +35962,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Junction City</_name>
+          <name>Junction City</name>
           <coordinates>39.028609 -96.831398</coordinates>
           <location>
             <name>Fort Riley, Marshall AAF Ft Riley</name>
@@ -35972,7 +35972,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Kansas City</_name>
+          <name msgctxt="City in Kansas, United States">Kansas City</name>
           <coordinates>39.114171 -94.627457</coordinates>
           <location>
             <name>Kansas City Downtown Airport</name>
@@ -35991,7 +35991,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name msgctxt="City in Kansas, United States">Lawrence</_name>
+          <name msgctxt="City in Kansas, United States">Lawrence</name>
           <coordinates>38.971669 -95.235250</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -36001,7 +36001,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Liberal</_name>
+          <name>Liberal</name>
           <coordinates>37.043081 -100.920999</coordinates>
           <location>
             <name>Liberal Municipal Airport</name>
@@ -36013,7 +36013,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Manhattan</_name>
+          <name>Manhattan</name>
           <coordinates>39.183608 -96.571669</coordinates>
           <location>
             <name>Manhattan Municipal Airport</name>
@@ -36025,7 +36025,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Medicine Lodge</_name>
+          <name>Medicine Lodge</name>
           <coordinates>37.281134 -98.580361</coordinates>
           <location>
             <name>Medicine Lodge</name>
@@ -36037,7 +36037,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Newton</_name>
+          <name>Newton</name>
           <coordinates>38.046678 -97.345037</coordinates>
           <location>
             <name>Newton City / County Airport</name>
@@ -36047,7 +36047,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Olathe</_name>
+          <name>Olathe</name>
           <coordinates>38.881396 -94.819129</coordinates>
           <location>
             <name>Johnson County Executive Airport</name>
@@ -36066,7 +36066,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Overland Park</_name>
+          <name>Overland Park</name>
           <coordinates>38.982228 -94.670792</coordinates>
           <location>
             <name>Olathe, Johnson County Executive Airport</name>
@@ -36078,7 +36078,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Parsons</_name>
+          <name>Parsons</name>
           <coordinates>37.340338 -95.261084</coordinates>
           <location>
             <name>Tri-City Airport</name>
@@ -36088,7 +36088,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Pratt</_name>
+          <name>Pratt</name>
           <coordinates>37.643907 -98.737591</coordinates>
           <location>
             <name>Pratt Municipal</name>
@@ -36098,7 +36098,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Russell</_name>
+          <name>Russell</name>
           <coordinates>38.895289 -98.859806</coordinates>
           <location>
             <name>Russell Municipal Airport</name>
@@ -36110,7 +36110,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Salina</_name>
+          <name>Salina</name>
           <coordinates>38.840280 -97.611424</coordinates>
           <location>
             <name>Salina Municipal Airport</name>
@@ -36122,7 +36122,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Topeka</_name>
+          <name>Topeka</name>
           <coordinates>39.048334 -95.678037</coordinates>
           <location>
             <name>Philip Billard Municipal Airport</name>
@@ -36141,7 +36141,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Wichita</_name>
+          <name>Wichita</name>
           <coordinates>37.692236 -97.337545</coordinates>
           <location>
             <name>Wichita Mid-Continent Airport</name>
@@ -36165,7 +36165,7 @@
         </city>
         <city>
           <!-- A city in Kansas in the United States -->
-          <_name>Winfield</_name>
+          <name>Winfield</name>
           <coordinates>37.239749 -96.995592</coordinates>
           <location>
             <name>Winfield / Arkansas City, Strother Field</name>
@@ -36176,12 +36176,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Kentucky</_name>
+        <name>Kentucky</name>
         <fips-code>US21</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Bowling Green</_name>
+          <name>Bowling Green</name>
           <coordinates>36.990320 -86.443602</coordinates>
           <location>
             <name>Bowling Green-Warren County Regional Airport</name>
@@ -36194,7 +36194,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">Frankfort</_name>
+          <name msgctxt="City in Kentucky, United States">Frankfort</name>
           <coordinates>38.200905 -84.873284</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -36206,7 +36206,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">Glasgow</_name>
+          <name msgctxt="City in Kentucky, United States">Glasgow</name>
           <coordinates>36.995884 -85.911922</coordinates>
           <location>
             <name>Glasgow Municipal Airport</name>
@@ -36217,7 +36217,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">Henderson</_name>
+          <name msgctxt="City in Kentucky, United States">Henderson</name>
           <coordinates>37.836154 -87.590013</coordinates>
           <location>
             <name>Henderson City</name>
@@ -36230,7 +36230,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">Jackson</_name>
+          <name msgctxt="City in Kentucky, United States">Jackson</name>
           <coordinates>37.553146 -83.383514</coordinates>
           <location>
             <name>Carroll Airport</name>
@@ -36242,7 +36242,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">Lexington</_name>
+          <name msgctxt="City in Kentucky, United States">Lexington</name>
           <coordinates>37.988689 -84.477715</coordinates>
           <location>
             <name>Blue Grass Airport</name>
@@ -36254,7 +36254,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name msgctxt="City in Kentucky, United States">London</_name>
+          <name msgctxt="City in Kentucky, United States">London</name>
           <coordinates>37.128977 -84.083265</coordinates>
           <location>
             <name>London-Corbin Airport-Magee Field</name>
@@ -36265,7 +36265,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Louisville</_name>
+          <name>Louisville</name>
           <coordinates>38.254238 -85.759407</coordinates>
           <location>
             <name>Bowman Field Airport</name>
@@ -36284,7 +36284,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Middlesboro</_name>
+          <name>Middlesboro</name>
           <coordinates>36.608415 -83.716582</coordinates>
           <location>
             <name>Middlesboro-Bell County Airport</name>
@@ -36294,7 +36294,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Muldraugh</_name>
+          <name>Muldraugh</name>
           <coordinates>37.937016 -85.991631</coordinates>
           <location>
             <name>Fort Knox</name>
@@ -36306,7 +36306,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Owensboro</_name>
+          <name>Owensboro</name>
           <coordinates>37.774215 -87.113330</coordinates>
           <location>
             <name>Owensboro-Daviess County Airport</name>
@@ -36319,7 +36319,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Paducah</_name>
+          <name>Paducah</name>
           <coordinates>37.083389 -88.600048</coordinates>
           <location>
             <name>Barkley Regional Airport</name>
@@ -36332,7 +36332,7 @@
         </city>
         <city>
           <!-- A city in Kentucky in the United States -->
-          <_name>Somerset</_name>
+          <name>Somerset</name>
           <coordinates>37.092022 -84.604108</coordinates>
           <location>
             <name>Somerset-Pulaski County - J.T. Wilson Field Airport</name>
@@ -36343,12 +36343,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Louisiana</_name>
+        <name>Louisiana</name>
         <fips-code>US22</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name msgctxt="City in Louisiana, United States">Alexandria</_name>
+          <name msgctxt="City in Louisiana, United States">Alexandria</name>
           <coordinates>31.311294 -92.445137</coordinates>
           <location>
             <name>Alexandria International Airport</name>
@@ -36367,7 +36367,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Amelia</_name>
+          <name>Amelia</name>
           <coordinates>29.666320 -91.102045</coordinates>
           <location>
             <name>Amelia / Lake Palourd</name>
@@ -36378,7 +36378,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Baton Rouge</_name>
+          <name>Baton Rouge</name>
           <coordinates>30.450746 -91.154551</coordinates>
           <location>
             <name>Baton Rouge Metropolitan, Ryan Field</name>
@@ -36390,7 +36390,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Boothville</_name>
+          <name>Boothville</name>
           <coordinates>29.343552 -89.419777</coordinates>
           <location>
             <name>Boothville</name>
@@ -36400,7 +36400,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>DeRidder</_name>
+          <name>DeRidder</name>
           <coordinates>30.846305 -93.289053</coordinates>
           <location>
             <name>Beauregard Parish Airport</name>
@@ -36410,7 +36410,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Fort Polk</_name>
+          <name>Fort Polk</name>
           <coordinates>31.046578 -93.205440</coordinates>
           <location>
             <name>Fort Polk, Polk AAF Ft Polk</name>
@@ -36422,7 +36422,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Galliano</_name>
+          <name>Galliano</name>
           <coordinates>29.442165 -90.299246</coordinates>
           <location>
             <name>South Lafourche Airport</name>
@@ -36432,7 +36432,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name msgctxt="City in Louisiana, United States">Garden City</_name>
+          <name msgctxt="City in Louisiana, United States">Garden City</name>
           <coordinates>29.765485 -91.465666</coordinates>
           <location>
             <name>Salt Point</name>
@@ -36443,7 +36443,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Goosport</_name>
+          <name>Goosport</name>
           <coordinates>30.256872 -93.180431</coordinates>
           <location>
             <name>Chenault Airpark</name>
@@ -36453,7 +36453,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Grand Isle</_name>
+          <name>Grand Isle</name>
           <coordinates>29.236617 -89.987294</coordinates>
           <location>
             <name>Grand Isle Supplementary Aviation Weather Reporting Station</name>
@@ -36463,7 +36463,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Hammond</_name>
+          <name>Hammond</name>
           <coordinates>30.504358 -90.461200</coordinates>
           <location>
             <name>Hammond Municipal Airport</name>
@@ -36473,7 +36473,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Hicks</_name>
+          <name>Hicks</name>
           <coordinates>31.184905 -93.015991</coordinates>
           <location>
             <name>Ft. Polk, Self Strip</name>
@@ -36483,7 +36483,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Houma</_name>
+          <name>Houma</name>
           <coordinates>29.595770 -90.719535</coordinates>
           <location>
             <name>Houma-Terrebonne</name>
@@ -36495,7 +36495,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name msgctxt="City in Louisiana, United States">Lafayette</_name>
+          <name msgctxt="City in Louisiana, United States">Lafayette</name>
           <coordinates>30.224090 -92.019843</coordinates>
           <location>
             <name>Lafayette Regional Airport</name>
@@ -36507,7 +36507,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Lake Charles</_name>
+          <name>Lake Charles</name>
           <coordinates>30.226595 -93.217376</coordinates>
           <location>
             <name>Lake Charles Regional Airport</name>
@@ -36519,7 +36519,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Leeville</_name>
+          <name>Leeville</name>
           <coordinates>29.248005 -90.207577</coordinates>
           <location>
             <name>Fourchon Supplementary Aviation Weather Reporting Station</name>
@@ -36530,7 +36530,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name msgctxt="City in Louisiana, United States">Monroe</_name>
+          <name msgctxt="City in Louisiana, United States">Monroe</name>
           <coordinates>32.509311 -92.119301</coordinates>
           <location>
             <name>Monroe Regional Airport</name>
@@ -36542,7 +36542,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Natchitoches</_name>
+          <name>Natchitoches</name>
           <coordinates>31.760720 -93.086275</coordinates>
           <location>
             <name>Natchitoches Regional Airport</name>
@@ -36552,7 +36552,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>New Iberia</_name>
+          <name>New Iberia</name>
           <coordinates>30.003536 -91.818729</coordinates>
           <location>
             <name>Acadiana Regional Airport</name>
@@ -36564,7 +36564,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>New Orleans</_name>
+          <name>New Orleans</name>
           <coordinates>29.954648 -90.075072</coordinates>
           <location>
             <name>New Orleans Lakefront Airport</name>
@@ -36588,7 +36588,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Oakdale</_name>
+          <name>Oakdale</name>
           <coordinates>30.816028 -92.660421</coordinates>
           <location>
             <name>Allen Parish Airport</name>
@@ -36598,7 +36598,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Patterson</_name>
+          <name>Patterson</name>
           <coordinates>29.693264 -91.302050</coordinates>
           <location>
             <name>Patterson Memorial</name>
@@ -36608,7 +36608,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Peason</_name>
+          <name>Peason</name>
           <coordinates>31.413789 -93.294613</coordinates>
           <location>
             <name>Ft. Polk, Peason Ridge</name>
@@ -36618,7 +36618,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Ruston</_name>
+          <name>Ruston</name>
           <coordinates>32.523205 -92.637927</coordinates>
           <location>
             <name>Ruston Regional Airport</name>
@@ -36628,7 +36628,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Shreveport</_name>
+          <name>Shreveport</name>
           <coordinates>32.525152 -93.750179</coordinates>
           <location>
             <name>Shreveport Downtown Airport</name>
@@ -36653,7 +36653,7 @@
         </city>
         <city>
           <!-- A city in Louisiana in the United States -->
-          <_name>Slidell</_name>
+          <name>Slidell</name>
           <coordinates>30.275195 -89.781175</coordinates>
           <location>
             <name>Slidell Airport</name>
@@ -36664,12 +36664,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Maine</_name>
+        <name>Maine</name>
         <fips-code>US23</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Auburn</_name>
+          <name msgctxt="City in Maine, United States">Auburn</name>
           <coordinates>44.097851 -70.231166</coordinates>
           <location>
             <name>Auburn-Lewiston</name>
@@ -36681,7 +36681,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Augusta</_name>
+          <name msgctxt="City in Maine, United States">Augusta</name>
           <coordinates>44.310624 -69.779490</coordinates>
           <location>
             <name>Augusta State Airport</name>
@@ -36693,7 +36693,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Bangor</_name>
+          <name>Bangor</name>
           <coordinates>44.801182 -68.777814</coordinates>
           <location>
             <name>Bangor International Airport</name>
@@ -36705,7 +36705,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Bar Harbor</_name>
+          <name>Bar Harbor</name>
           <coordinates>44.387579 -68.203902</coordinates>
           <location>
             <name>Hancock County-Bar Harbor Airport</name>
@@ -36717,7 +36717,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Brunswick</_name>
+          <name msgctxt="City in Maine, United States">Brunswick</name>
           <coordinates>43.914524 -69.965328</coordinates>
           <location>
             <name>Brunswick, Naval Air Station</name>
@@ -36729,7 +36729,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Caribou</_name>
+          <name>Caribou</name>
           <coordinates>46.860598 -68.011971</coordinates>
           <location>
             <name>Caribou Municipal Airport</name>
@@ -36741,7 +36741,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Frenchville</_name>
+          <name>Frenchville</name>
           <coordinates>47.280873 -68.379765</coordinates>
           <location>
             <name>Northern Aroostook Regional Airport</name>
@@ -36753,7 +36753,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Fryeburg</_name>
+          <name>Fryeburg</name>
           <coordinates>44.016459 -70.980624</coordinates>
           <location>
             <name>Eastern Slopes Regional Airport</name>
@@ -36764,7 +36764,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Greenville</_name>
+          <name msgctxt="City in Maine, United States">Greenville</name>
           <coordinates>45.459491 -69.590610</coordinates>
           <location>
             <name>Greenville</name>
@@ -36774,7 +36774,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Houlton</_name>
+          <name>Houlton</name>
           <coordinates>46.126164 -67.840296</coordinates>
           <location>
             <name>Houlton International Airport</name>
@@ -36786,7 +36786,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Millinocket</_name>
+          <name>Millinocket</name>
           <coordinates>45.657272 -68.709758</coordinates>
           <location>
             <name>Millinocket Municipal Airport</name>
@@ -36798,7 +36798,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Portland</_name>
+          <name msgctxt="City in Maine, United States">Portland</name>
           <coordinates>43.661471 -70.255326</coordinates>
           <location>
             <name>Portland International Jetport</name>
@@ -36810,7 +36810,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Presque Isle</_name>
+          <name>Presque Isle</name>
           <coordinates>46.681153 -68.015862</coordinates>
           <location>
             <name>Presque Isle</name>
@@ -36822,7 +36822,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Rockland</_name>
+          <name>Rockland</name>
           <coordinates>44.103691 -69.108929</coordinates>
           <location>
             <name>Knox County Regional Airport</name>
@@ -36834,7 +36834,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name msgctxt="City in Maine, United States">Sanford</_name>
+          <name msgctxt="City in Maine, United States">Sanford</name>
           <coordinates>43.439249 -70.774225</coordinates>
           <location>
             <name>Sanford Regional Airport</name>
@@ -36846,7 +36846,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Waterville</_name>
+          <name>Waterville</name>
           <coordinates>44.552011 -69.631712</coordinates>
           <location>
             <name>Waterville Robert LaFleur Airport</name>
@@ -36858,7 +36858,7 @@
         </city>
         <city>
           <!-- A city in Maine in the United States -->
-          <_name>Wiscasset</_name>
+          <name>Wiscasset</name>
           <coordinates>44.002856 -69.665602</coordinates>
           <location>
             <name>Wiscasset Airport</name>
@@ -36871,12 +36871,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Maryland</_name>
+        <name>Maryland</name>
         <fips-code>US24</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Annapolis</_name>
+          <name>Annapolis</name>
           <coordinates>38.978445 -76.492183</coordinates>
           <location>
             <name>Annapolis, United States Naval Academy</name>
@@ -36886,7 +36886,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Baltimore</_name>
+          <name>Baltimore</name>
           <coordinates>39.290385 -76.612189</coordinates>
           <location>
             <name>Baltimore, Inner Harbor</name>
@@ -36919,7 +36919,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Camp Springs</_name>
+          <name>Camp Springs</name>
           <coordinates>38.804003 -76.906640</coordinates>
           <location>
             <name>Camp Springs / Andrews Air Force Base</name>
@@ -36929,7 +36929,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Cumberland</_name>
+          <name>Cumberland</name>
           <coordinates>39.652865 -78.762518</coordinates>
           <location>
             <name>Greater Cumberland Regional Airport</name>
@@ -36940,7 +36940,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Easton</_name>
+          <name>Easton</name>
           <coordinates>38.774283 -76.076330</coordinates>
           <location>
             <name>Easton / Newman Field</name>
@@ -36950,7 +36950,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name msgctxt="City in Maryland, United States">Frederick</_name>
+          <name msgctxt="City in Maryland, United States">Frederick</name>
           <coordinates>39.414269 -77.410541</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -36960,7 +36960,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Hagerstown</_name>
+          <name>Hagerstown</name>
           <coordinates>39.641763 -77.719993</coordinates>
           <location>
             <name>Washington County Regional Airport</name>
@@ -36972,7 +36972,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Ocean City</_name>
+          <name>Ocean City</name>
           <coordinates>38.336503 -75.084906</coordinates>
           <location>
             <name>Ocean City Municipal Airport</name>
@@ -36982,7 +36982,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Patuxent</_name>
+          <name>Patuxent</name>
           <coordinates>38.539288 -76.748577</coordinates>
           <location>
             <name>Patuxent River, Naval Air Station</name>
@@ -36994,7 +36994,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name>Saint Marys City</_name>
+          <name>Saint Marys City</name>
           <coordinates>38.187070 -76.434396</coordinates>
           <location>
             <name>St. Inigoes, Webster Field, Naval Electronic Systems Engineering Activity</name>
@@ -37004,7 +37004,7 @@
         </city>
         <city>
           <!-- A city in Maryland in the United States -->
-          <_name msgctxt="City in Maryland, United States">Salisbury</_name>
+          <name msgctxt="City in Maryland, United States">Salisbury</name>
           <coordinates>38.360674 -75.599369</coordinates>
           <location>
             <name>Salisbury-Ocean City Wicomico County Regional Airport</name>
@@ -37017,12 +37017,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Massachusetts</_name>
+        <name>Massachusetts</name>
         <fips-code>US25</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Bedford</_name>
+          <name msgctxt="City in Massachusetts, United States">Bedford</name>
           <coordinates>42.490650 -71.276169</coordinates>
           <location>
             <name>Hanscom Field</name>
@@ -37034,7 +37034,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Beverly</_name>
+          <name>Beverly</name>
           <coordinates>42.558428 -70.880049</coordinates>
           <location>
             <name>Beverly Municipal Airport</name>
@@ -37046,7 +37046,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Boston</_name>
+          <name>Boston</name>
           <coordinates>42.358431 -71.059773</coordinates>
           <location>
             <name>Logan International Airport</name>
@@ -37058,7 +37058,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Cambridge</_name>
+          <name msgctxt="City in Massachusetts, United States">Cambridge</name>
           <coordinates>42.375097 -71.105608</coordinates>
           <location>
             <name>Boston, Logan International Airport</name>
@@ -37070,7 +37070,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Chatham</_name>
+          <name>Chatham</name>
           <coordinates>41.682056 -69.959738</coordinates>
           <location>
             <name>Chatham Municipal Airport</name>
@@ -37082,7 +37082,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Chicopee Falls</_name>
+          <name>Chicopee Falls</name>
           <coordinates>42.152038 -72.575922</coordinates>
           <location>
             <name>Chicopee Falls / Westover Air Force Base</name>
@@ -37093,7 +37093,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>East Milton</_name>
+          <name>East Milton</name>
           <coordinates>42.258432 -71.042550</coordinates>
           <location>
             <name>East Milton</name>
@@ -37103,7 +37103,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Fitchburg</_name>
+          <name>Fitchburg</name>
           <coordinates>42.583423 -71.802296</coordinates>
           <location>
             <name>Fitchburg Municipal Airport</name>
@@ -37114,7 +37114,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Hyannis</_name>
+          <name>Hyannis</name>
           <coordinates>41.652889 -70.282799</coordinates>
           <location>
             <name>Barnstable Municipal-Boardman Airport</name>
@@ -37126,7 +37126,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Lawrence</_name>
+          <name msgctxt="City in Massachusetts, United States">Lawrence</name>
           <coordinates>42.707035 -71.163114</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -37138,7 +37138,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Lowell</_name>
+          <name msgctxt="City in Massachusetts, United States">Lowell</name>
           <coordinates>42.633425 -71.316172</coordinates>
           <location>
             <name>Lawrence, Lawrence Municipal Airport</name>
@@ -37150,7 +37150,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Nantucket</_name>
+          <name>Nantucket</name>
           <coordinates>41.283456 -70.099461</coordinates>
           <location>
             <name>Nantucket Memorial Airport</name>
@@ -37162,7 +37162,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>New Bedford</_name>
+          <name>New Bedford</name>
           <coordinates>41.636215 -70.934205</coordinates>
           <location>
             <name>New Bedford Regional Airport</name>
@@ -37174,7 +37174,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>North Adams</_name>
+          <name>North Adams</name>
           <coordinates>42.700915 -73.108715</coordinates>
           <location>
             <name>Harriman-And-West Airport</name>
@@ -37184,7 +37184,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Norwood</_name>
+          <name>Norwood</name>
           <coordinates>42.194543 -71.199498</coordinates>
           <location>
             <name>Norwood Memorial Airport</name>
@@ -37196,7 +37196,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Orange</_name>
+          <name msgctxt="City in Massachusetts, United States">Orange</name>
           <coordinates>42.590365 -72.309807</coordinates>
           <location>
             <name>Orange Municipal Airport</name>
@@ -37207,7 +37207,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Pittsfield</_name>
+          <name msgctxt="City in Massachusetts, United States">Pittsfield</name>
           <coordinates>42.450085 -73.245382</coordinates>
           <location>
             <name>Pittsfield Municipal Airport</name>
@@ -37217,7 +37217,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Plymouth</_name>
+          <name msgctxt="City in Massachusetts, United States">Plymouth</name>
           <coordinates>41.958437 -70.667258</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -37229,7 +37229,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Provincetown</_name>
+          <name>Provincetown</name>
           <coordinates>42.058436 -70.178637</coordinates>
           <location>
             <name>Provincetown Municipal Airport</name>
@@ -37240,7 +37240,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Sandwich</_name>
+          <name>Sandwich</name>
           <coordinates>41.758995 -70.493916</coordinates>
           <location>
             <name>Otis Air National Guard Base</name>
@@ -37252,7 +37252,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name msgctxt="City in Massachusetts, United States">Springfield</_name>
+          <name msgctxt="City in Massachusetts, United States">Springfield</name>
           <coordinates>42.101483 -72.589811</coordinates>
           <location>
             <name>Chicopee Falls / Westover Air Force Base</name>
@@ -37263,7 +37263,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Vineyard Haven</_name>
+          <name>Vineyard Haven</name>
           <coordinates>41.454279 -70.603639</coordinates>
           <location>
             <name>Marthas Vineyard Airport</name>
@@ -37275,7 +37275,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Westfield</_name>
+          <name>Westfield</name>
           <coordinates>42.125093 -72.749538</coordinates>
           <location>
             <name>Barnes Municipal Airport</name>
@@ -37287,7 +37287,7 @@
         </city>
         <city>
           <!-- A city in Massachusetts in the United States -->
-          <_name>Worcester</_name>
+          <name>Worcester</name>
           <coordinates>42.262593 -71.802293</coordinates>
           <location>
             <name>Worcester Regional Airport</name>
@@ -37300,12 +37300,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Michigan</_name>
+        <name>Michigan</name>
         <fips-code>US26</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Adrian</_name>
+          <name>Adrian</name>
           <coordinates>41.897547 -84.037166</coordinates>
           <location>
             <name>Lenawee County Airport</name>
@@ -37315,7 +37315,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Alma</_name>
+          <name msgctxt="City in Michigan, United States">Alma</name>
           <coordinates>43.378920 -84.659727</coordinates>
           <location>
             <name>Gratiot Community Airport</name>
@@ -37325,7 +37325,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Alpena</_name>
+          <name>Alpena</name>
           <coordinates>45.061679 -83.432753</coordinates>
           <location>
             <name>Alpena County Regional Airport</name>
@@ -37337,7 +37337,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Ann Arbor</_name>
+          <name>Ann Arbor</name>
           <coordinates>42.270872 -83.726329</coordinates>
           <location>
             <name>Ann Arbor Municipal Airport</name>
@@ -37349,7 +37349,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Bad Axe</_name>
+          <name>Bad Axe</name>
           <coordinates>43.801959 -83.000777</coordinates>
           <location>
             <name>Huron County Memorial Airport</name>
@@ -37359,7 +37359,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Battle Creek</_name>
+          <name>Battle Creek</name>
           <coordinates>42.321152 -85.179714</coordinates>
           <location>
             <name>Kellogg Airport</name>
@@ -37371,7 +37371,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Bellaire</_name>
+          <name>Bellaire</name>
           <coordinates>44.980282 -85.211173</coordinates>
           <location>
             <name>Antrim County Airport</name>
@@ -37381,7 +37381,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Benton Harbor</_name>
+          <name>Benton Harbor</name>
           <coordinates>42.116706 -86.454189</coordinates>
           <location>
             <name>Southwest Michigan Regional Airport</name>
@@ -37392,7 +37392,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Big Rapids</_name>
+          <name>Big Rapids</name>
           <coordinates>43.698078 -85.483656</coordinates>
           <location>
             <name>Roben-Hood Airport</name>
@@ -37402,7 +37402,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Cadillac</_name>
+          <name>Cadillac</name>
           <coordinates>44.251953 -85.401162</coordinates>
           <location>
             <name>Cadillac / Wexford County</name>
@@ -37412,7 +37412,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Caro</_name>
+          <name>Caro</name>
           <coordinates>43.491132 -83.396897</coordinates>
           <location>
             <name>Tuscola Area Airport</name>
@@ -37422,7 +37422,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Charlevoix</_name>
+          <name>Charlevoix</name>
           <coordinates>45.318063 -85.258400</coordinates>
           <location>
             <name>Charlevoix Municipal Airport</name>
@@ -37432,7 +37432,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Charlotte</_name>
+          <name msgctxt="City in Michigan, United States">Charlotte</name>
           <coordinates>42.563648 -84.835821</coordinates>
           <location>
             <name>Fitch H Beach Airport</name>
@@ -37442,7 +37442,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Cheboygan</_name>
+          <name>Cheboygan</name>
           <coordinates>45.646956 -84.474480</coordinates>
           <location>
             <name>Cheboygan County Airport</name>
@@ -37452,7 +37452,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Coldwater</_name>
+          <name>Coldwater</name>
           <coordinates>41.940326 -85.000522</coordinates>
           <location>
             <name>Branch County Memorial Airport</name>
@@ -37462,7 +37462,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Copper Harbor</_name>
+          <name>Copper Harbor</name>
           <coordinates>47.468794 -87.888442</coordinates>
           <location>
             <name>Copper Harbor</name>
@@ -37474,7 +37474,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Detroit</_name>
+          <name>Detroit</name>
           <coordinates>42.331427 -83.045754</coordinates>
           <location>
             <name>Detroit City Airport</name>
@@ -37505,7 +37505,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Escanaba</_name>
+          <name>Escanaba</name>
           <coordinates>45.745247 -87.064580</coordinates>
           <location>
             <name>Escanaba</name>
@@ -37517,7 +37517,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Flint</_name>
+          <name>Flint</name>
           <coordinates>43.012527 -83.687456</coordinates>
           <location>
             <name>Bishop International Airport</name>
@@ -37529,7 +37529,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Frankfort</_name>
+          <name msgctxt="City in Michigan, United States">Frankfort</name>
           <coordinates>44.633610 -86.234540</coordinates>
           <location>
             <name>Frankfort Dow Memorial Field Airport</name>
@@ -37539,7 +37539,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Gaylord</_name>
+          <name>Gaylord</name>
           <coordinates>45.027513 -84.674752</coordinates>
           <location>
             <name>Otsego County Airport</name>
@@ -37549,7 +37549,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Grand Rapids</_name>
+          <name msgctxt="City in Michigan, United States">Grand Rapids</name>
           <coordinates>42.963360 -85.668086</coordinates>
           <location>
             <name>Gerald R. Ford International Airport</name>
@@ -37561,7 +37561,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Grayling</_name>
+          <name>Grayling</name>
           <coordinates>44.661404 -84.714751</coordinates>
           <location>
             <name>Grayling Army Airfield</name>
@@ -37571,7 +37571,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Hancock</_name>
+          <name>Hancock</name>
           <coordinates>47.126871 -88.580956</coordinates>
           <location>
             <name>Houghton County Memorial Airport</name>
@@ -37583,7 +37583,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Harbor Springs</_name>
+          <name>Harbor Springs</name>
           <coordinates>45.431676 -84.991999</coordinates>
           <location>
             <name>Harbor Springs Airport</name>
@@ -37593,7 +37593,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Hillsdale</_name>
+          <name>Hillsdale</name>
           <coordinates>41.920047 -84.630510</coordinates>
           <location>
             <name>Hillsdale Municipal Airport</name>
@@ -37603,7 +37603,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Holland</_name>
+          <name>Holland</name>
           <coordinates>42.787523 -86.108930</coordinates>
           <location>
             <name>Tulip City Airport</name>
@@ -37613,7 +37613,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Houghton Lake</_name>
+          <name>Houghton Lake</name>
           <coordinates>44.314739 -84.764750</coordinates>
           <location>
             <name>Roscommon County Airport</name>
@@ -37625,7 +37625,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Howell</_name>
+          <name>Howell</name>
           <coordinates>42.607255 -83.929395</coordinates>
           <location>
             <name>Livingston County Airport</name>
@@ -37635,7 +37635,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Iron Mountain</_name>
+          <name>Iron Mountain</name>
           <coordinates>45.820233 -88.065960</coordinates>
           <location>
             <name>Iron Mountain / Kingsford, Ford Airport</name>
@@ -37647,7 +37647,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Ironwood</_name>
+          <name>Ironwood</name>
           <coordinates>46.454670 -90.171008</coordinates>
           <location>
             <name>Gogebic-Iron County Airport</name>
@@ -37660,7 +37660,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Jackson</_name>
+          <name msgctxt="City in Michigan, United States">Jackson</name>
           <coordinates>42.245869 -84.401346</coordinates>
           <location>
             <name>Jackson County-Reynolds Field Airport</name>
@@ -37672,7 +37672,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Kalamazoo</_name>
+          <name>Kalamazoo</name>
           <coordinates>42.291707 -85.587229</coordinates>
           <location>
             <name>Kalamazoo / Battle Creek International Airport</name>
@@ -37684,7 +37684,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Kinross</_name>
+          <name>Kinross</name>
           <coordinates>46.275019 -84.514768</coordinates>
           <location>
             <name>Sault Ste Marie, Chippewa County International Airport</name>
@@ -37696,7 +37696,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Lambertville</_name>
+          <name>Lambertville</name>
           <coordinates>41.765882 -83.627992</coordinates>
           <location>
             <name>Toledo Suburban Airport</name>
@@ -37706,7 +37706,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Lansing</_name>
+          <name>Lansing</name>
           <coordinates>42.732535 -84.555535</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -37718,7 +37718,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Livonia</_name>
+          <name>Livonia</name>
           <coordinates>42.368370 -83.352710</coordinates>
           <location>
             <name>Detroit, Detroit Metropolitan Wayne County Airport</name>
@@ -37730,7 +37730,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Ludington</_name>
+          <name>Ludington</name>
           <coordinates>43.955283 -86.452583</coordinates>
           <location>
             <name>Mason County Airport</name>
@@ -37740,7 +37740,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Mackinac Island</_name>
+          <name>Mackinac Island</name>
           <coordinates>45.849180 -84.618934</coordinates>
           <location>
             <name>Macinac Island, Mackinac Island Airport</name>
@@ -37750,7 +37750,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Manistee</_name>
+          <name>Manistee</name>
           <coordinates>44.244447 -86.324253</coordinates>
           <location>
             <name>Manistee County-Blacker Airport</name>
@@ -37762,7 +37762,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Manistique</_name>
+          <name>Manistique</name>
           <coordinates>45.957751 -86.246252</coordinates>
           <location>
             <name>Schoolcraft County Airport</name>
@@ -37772,7 +37772,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Marquette</_name>
+          <name>Marquette</name>
           <coordinates>46.543544 -87.395417</coordinates>
           <location>
             <name>Sawyer International Airport</name>
@@ -37784,7 +37784,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Marshall</_name>
+          <name msgctxt="City in Michigan, United States">Marshall</name>
           <coordinates>42.272264 -84.963315</coordinates>
           <location>
             <name>Brooks Field Airport</name>
@@ -37794,7 +37794,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Marysville</_name>
+          <name msgctxt="City in Michigan, United States">Marysville</name>
           <coordinates>42.912531 -82.486860</coordinates>
           <location>
             <name>St. Clair County International Airport</name>
@@ -37804,7 +37804,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Mason</_name>
+          <name>Mason</name>
           <coordinates>42.579203 -84.443585</coordinates>
           <location>
             <name>Mason Jewett Field Airport</name>
@@ -37814,7 +37814,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Menominee</_name>
+          <name>Menominee</name>
           <coordinates>45.107763 -87.614274</coordinates>
           <location>
             <name>Menominee-Marinette Twin County Airport</name>
@@ -37827,7 +37827,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Monroe</_name>
+          <name msgctxt="City in Michigan, United States">Monroe</name>
           <coordinates>41.916434 -83.397710</coordinates>
           <location>
             <name>Custer Airport</name>
@@ -37837,7 +37837,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Mount Pleasant</_name>
+          <name msgctxt="City in Michigan, United States">Mount Pleasant</name>
           <coordinates>43.597808 -84.767514</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -37847,7 +37847,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Munising</_name>
+          <name>Munising</name>
           <coordinates>46.411057 -86.647936</coordinates>
           <location>
             <name>Munising Lakeshore Observation</name>
@@ -37857,7 +37857,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Muskegon</_name>
+          <name>Muskegon</name>
           <coordinates>43.234181 -86.248392</coordinates>
           <location>
             <name>Muskegon County Airport</name>
@@ -37869,7 +37869,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Newberry</_name>
+          <name>Newberry</name>
           <coordinates>46.354998 -85.509559</coordinates>
           <location>
             <name>Luce County Airport</name>
@@ -37879,7 +37879,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Oscoda</_name>
+          <name>Oscoda</name>
           <coordinates>44.420293 -83.330801</coordinates>
           <location>
             <name>Oscoda-Wurtsmith Airport</name>
@@ -37891,7 +37891,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Owosso</_name>
+          <name>Owosso</name>
           <coordinates>42.997805 -84.176636</coordinates>
           <location>
             <name>Owosso Community Airport</name>
@@ -37901,7 +37901,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Pellston</_name>
+          <name>Pellston</name>
           <coordinates>45.552789 -84.783936</coordinates>
           <location>
             <name>Pellston Regional Airport of Emmet County Airport</name>
@@ -37913,7 +37913,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Pontiac</_name>
+          <name msgctxt="City in Michigan, United States">Pontiac</name>
           <coordinates>42.638922 -83.291047</coordinates>
           <location>
             <name>Oakland County International Airport</name>
@@ -37925,7 +37925,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Port Hope</_name>
+          <name>Port Hope</name>
           <coordinates>43.940845 -82.712712</coordinates>
           <location>
             <name>Port Hope</name>
@@ -37937,7 +37937,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Rogers City</_name>
+          <name>Rogers City</name>
           <coordinates>45.421402 -83.818330</coordinates>
           <location>
             <name>Presque Isle County Airport</name>
@@ -37947,7 +37947,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Saginaw</_name>
+          <name>Saginaw</name>
           <coordinates>43.419470 -83.950807</coordinates>
           <location>
             <name>Saginaw County H.W. Browne Airport</name>
@@ -37964,7 +37964,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Saint James</_name>
+          <name msgctxt="City in Michigan, United States">Saint James</name>
           <coordinates>45.751110 -85.515643</coordinates>
           <location>
             <name>Beaver Island, Beaver Island Airport</name>
@@ -37974,7 +37974,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Sault Ste. Marie</_name>
+          <name>Sault Ste. Marie</name>
           <coordinates>46.495300 -84.345317</coordinates>
           <location>
             <name>Sault Ste. Marie</name>
@@ -37986,7 +37986,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>South Haven</_name>
+          <name>South Haven</name>
           <coordinates>42.403087 -86.273641</coordinates>
           <location>
             <name>South Haven Area Regional Airport</name>
@@ -37996,7 +37996,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Sterling Heights</_name>
+          <name>Sterling Heights</name>
           <coordinates>42.580312 -83.030203</coordinates>
           <location>
             <name>Selfridge Air National Guard Base</name>
@@ -38008,7 +38008,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Sturgis</_name>
+          <name>Sturgis</name>
           <coordinates>41.799217 -85.419148</coordinates>
           <location>
             <name>Kirsch Municipal Airport</name>
@@ -38018,7 +38018,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Traverse City</_name>
+          <name>Traverse City</name>
           <coordinates>44.763057 -85.620632</coordinates>
           <location>
             <name>Cherry Capital Airport</name>
@@ -38030,7 +38030,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name msgctxt="City in Michigan, United States">Troy</_name>
+          <name msgctxt="City in Michigan, United States">Troy</name>
           <coordinates>42.605589 -83.149930</coordinates>
           <location>
             <name>Oakland / Troy Airport</name>
@@ -38040,7 +38040,7 @@
         </city>
         <city>
           <!-- A city in Michigan in the United States -->
-          <_name>Warren</_name>
+          <name>Warren</name>
           <coordinates>42.477536 -83.027700</coordinates>
           <location>
             <name>Detroit, Detroit City Airport</name>
@@ -38053,12 +38053,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Minnesota</_name>
+        <name>Minnesota</name>
         <fips-code>US27</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Aitkin</_name>
+          <name>Aitkin</name>
           <coordinates>46.533013 -93.710249</coordinates>
           <location>
             <name>Aitkin Municipal Airport-Steve Kurtz Field</name>
@@ -38068,7 +38068,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Albert Lea</_name>
+          <name>Albert Lea</name>
           <coordinates>43.648013 -93.368266</coordinates>
           <location>
             <name>Albert Lea Municipal Airport</name>
@@ -38078,7 +38078,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Alexandria</_name>
+          <name msgctxt="City in Minnesota, United States">Alexandria</name>
           <coordinates>45.885240 -95.377538</coordinates>
           <location>
             <name>Chandler Field</name>
@@ -38090,7 +38090,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Angle Inlet</_name>
+          <name>Angle Inlet</name>
           <coordinates>49.345274 -95.062738</coordinates>
           <location>
             <name>Flag Island</name>
@@ -38100,7 +38100,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Appleton</_name>
+          <name msgctxt="City in Minnesota, United States">Appleton</name>
           <coordinates>45.196906 -96.019767</coordinates>
           <location>
             <name>Appleton Municipal Airport</name>
@@ -38110,7 +38110,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Austin</_name>
+          <name msgctxt="City in Minnesota, United States">Austin</name>
           <coordinates>43.666630 -92.974637</coordinates>
           <location>
             <name>Austin Municipal</name>
@@ -38120,7 +38120,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Baudette</_name>
+          <name>Baudette</name>
           <coordinates>48.712474 -94.599930</coordinates>
           <location>
             <name>Baudette International Airport</name>
@@ -38130,7 +38130,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Bemidji</_name>
+          <name>Bemidji</name>
           <coordinates>47.473563 -94.880277</coordinates>
           <location>
             <name>Bemidji</name>
@@ -38142,7 +38142,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Benson</_name>
+          <name msgctxt="City in Minnesota, United States">Benson</name>
           <coordinates>45.314960 -95.600035</coordinates>
           <location>
             <name>Benson Municipal</name>
@@ -38152,7 +38152,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Bigfork</_name>
+          <name>Bigfork</name>
           <coordinates>47.744387 -93.654085</coordinates>
           <location>
             <name>Bigfork Municipal Airport</name>
@@ -38162,7 +38162,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Brainerd</_name>
+          <name>Brainerd</name>
           <coordinates>46.358022 -94.200829</coordinates>
           <location>
             <name>Brainerd-Crow Wing County Regional Airport</name>
@@ -38174,7 +38174,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Buffalo</_name>
+          <name msgctxt="City in Minnesota, United States">Buffalo</name>
           <coordinates>45.171908 -93.874694</coordinates>
           <location>
             <name>Buffalo Municipal Airport</name>
@@ -38184,7 +38184,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Cambridge</_name>
+          <name msgctxt="City in Minnesota, United States">Cambridge</name>
           <coordinates>45.572741 -93.224392</coordinates>
           <location>
             <name>Cambridge Municipal</name>
@@ -38194,7 +38194,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Cloquet</_name>
+          <name>Cloquet</name>
           <coordinates>46.721610 -92.459357</coordinates>
           <location>
             <name>Cloquet Carlton County Airport</name>
@@ -38204,7 +38204,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Cook</_name>
+          <name>Cook</name>
           <coordinates>47.852418 -92.689618</coordinates>
           <location>
             <name>Cook Municipal Airport</name>
@@ -38214,7 +38214,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Crane Lake</_name>
+          <name>Crane Lake</name>
           <coordinates>48.266572 -92.488491</coordinates>
           <location>
             <name>Scotts Seaplane Base</name>
@@ -38224,7 +38224,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Crookston</_name>
+          <name>Crookston</name>
           <coordinates>47.774138 -96.608121</coordinates>
           <location>
             <name>Crookston Municipal Field</name>
@@ -38234,7 +38234,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Detroit Lakes</_name>
+          <name>Detroit Lakes</name>
           <coordinates>46.817181 -95.845325</coordinates>
           <location>
             <name>Detroit Lakes Airport-Wething Field</name>
@@ -38246,7 +38246,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Dodge Center</_name>
+          <name>Dodge Center</name>
           <coordinates>44.028020 -92.854638</coordinates>
           <location>
             <name>Dodge Center Airport</name>
@@ -38256,7 +38256,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Duluth</_name>
+          <name>Duluth</name>
           <coordinates>46.783273 -92.106579</coordinates>
           <location>
             <name>Sky Harbor Airport</name>
@@ -38275,7 +38275,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Ely</_name>
+          <name msgctxt="City in Minnesota, United States">Ely</name>
           <coordinates>47.903237 -91.867087</coordinates>
           <location>
             <name>Ely Municipal Airport</name>
@@ -38287,7 +38287,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Eveleth</_name>
+          <name>Eveleth</name>
           <coordinates>47.462428 -92.539906</coordinates>
           <location>
             <name>Eveleth-Virginia Municipal Airport</name>
@@ -38297,7 +38297,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Fairmont</_name>
+          <name>Fairmont</name>
           <coordinates>43.652178 -94.461083</coordinates>
           <location>
             <name>Fairmont Municipal Airport</name>
@@ -38309,7 +38309,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Faribault</_name>
+          <name>Faribault</name>
           <coordinates>44.294964 -93.268827</coordinates>
           <location>
             <name>Faribault Municipal Airport</name>
@@ -38319,7 +38319,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Fergus Falls</_name>
+          <name>Fergus Falls</name>
           <coordinates>46.283015 -96.077558</coordinates>
           <location>
             <name>Fergus Falls Municipal Airport-Einar Mickelson Field</name>
@@ -38331,7 +38331,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Fosston</_name>
+          <name>Fosston</name>
           <coordinates>47.576348 -95.751415</coordinates>
           <location>
             <name>Fosston Municipal Airport</name>
@@ -38341,7 +38341,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Glencoe</_name>
+          <name>Glencoe</name>
           <coordinates>44.769129 -94.151642</coordinates>
           <location>
             <name>Glencoe Municipal Airport</name>
@@ -38351,7 +38351,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Glenwood</_name>
+          <name>Glenwood</name>
           <coordinates>45.650239 -95.389758</coordinates>
           <location>
             <name>Glenwood Municipal Airport</name>
@@ -38361,7 +38361,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Grand Marais</_name>
+          <name>Grand Marais</name>
           <coordinates>47.750447 -90.334273</coordinates>
           <location>
             <name>Grand Marais, The Bay of Grand Marais</name>
@@ -38380,7 +38380,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Grand Rapids</_name>
+          <name msgctxt="City in Minnesota, United States">Grand Rapids</name>
           <coordinates>47.237166 -93.530214</coordinates>
           <location>
             <name>Grand Rapids / Itasca County Airport-Gordon Newstrom Field</name>
@@ -38392,7 +38392,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Granite Falls</_name>
+          <name>Granite Falls</name>
           <coordinates>44.809958 -95.545575</coordinates>
           <location>
             <name>Granite Falls Municipal Airport / Lenzen-Roe Memorial Field</name>
@@ -38402,7 +38402,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Hallock</_name>
+          <name>Hallock</name>
           <coordinates>48.774426 -96.946447</coordinates>
           <location>
             <name>Hallock Municipal Airport</name>
@@ -38412,7 +38412,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Hibbing</_name>
+          <name>Hibbing</name>
           <coordinates>47.427155 -92.937689</coordinates>
           <location>
             <name>Chisholm-Hibbing Airport</name>
@@ -38424,7 +38424,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Hutchinson</_name>
+          <name msgctxt="City in Minnesota, United States">Hutchinson</name>
           <coordinates>44.887740 -94.369706</coordinates>
           <location>
             <name>Hutchinson Municipal Airport-Butler Field</name>
@@ -38434,7 +38434,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>International Falls</_name>
+          <name>International Falls</name>
           <coordinates>48.601049 -93.410982</coordinates>
           <location>
             <name>Falls International Airport</name>
@@ -38446,7 +38446,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Inver Grove Heights</_name>
+          <name>Inver Grove Heights</name>
           <coordinates>44.848022 -93.042715</coordinates>
           <location>
             <name>South St. Paul, South St. Paul Municipal-Richard E. Fleming Field Airport</name>
@@ -38456,7 +38456,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Jackson</_name>
+          <name msgctxt="City in Minnesota, United States">Jackson</name>
           <coordinates>43.620792 -94.988602</coordinates>
           <location>
             <name>Jackson Municipal Airport</name>
@@ -38466,7 +38466,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Litchfield</_name>
+          <name msgctxt="City in Minnesota, United States">Litchfield</name>
           <coordinates>45.127185 -94.528047</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -38478,7 +38478,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Little Falls</_name>
+          <name>Little Falls</name>
           <coordinates>45.976354 -94.362502</coordinates>
           <location>
             <name>Little Falls / Morrison County Airport-Lindbergh Field</name>
@@ -38488,7 +38488,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Longville</_name>
+          <name>Longville</name>
           <coordinates>46.986344 -94.211364</coordinates>
           <location>
             <name>Longville Municipal Airport</name>
@@ -38498,7 +38498,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Luverne</_name>
+          <name>Luverne</name>
           <coordinates>43.654136 -96.212807</coordinates>
           <location>
             <name>Quentin Aanenson Field Airport</name>
@@ -38508,7 +38508,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Madison</_name>
+          <name msgctxt="City in Minnesota, United States">Madison</name>
           <coordinates>45.009685 -96.195876</coordinates>
           <location>
             <name>Madison-Lac Qui Parle County Airport</name>
@@ -38518,7 +38518,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Mankato</_name>
+          <name>Mankato</name>
           <coordinates>44.163578 -93.999400</coordinates>
           <location>
             <name>Mankato Regional Airport</name>
@@ -38530,7 +38530,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Maple Lake</_name>
+          <name>Maple Lake</name>
           <coordinates>45.229132 -94.001923</coordinates>
           <location>
             <name>Maple Lake Municipal Airport</name>
@@ -38540,7 +38540,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Marshall</_name>
+          <name msgctxt="City in Minnesota, United States">Marshall</name>
           <coordinates>44.446903 -95.788354</coordinates>
           <location>
             <name>Southwest Minnesota Regional Airport - Marshall / Ryan Field</name>
@@ -38552,7 +38552,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>McGregor</_name>
+          <name>McGregor</name>
           <coordinates>46.606615 -93.313842</coordinates>
           <location>
             <name>Isedor Iverson Airport</name>
@@ -38562,7 +38562,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Minneapolis</_name>
+          <name>Minneapolis</name>
           <coordinates>44.979965 -93.263836</coordinates>
           <location>
             <name>Minneapolis-St. Paul International Airport</name>
@@ -38609,7 +38609,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Montevideo</_name>
+          <name msgctxt="City in Minnesota, United States">Montevideo</name>
           <coordinates>44.942457 -95.723637</coordinates>
           <location>
             <name>Montevideo-Chippewa County Airport</name>
@@ -38619,7 +38619,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Moorhead</_name>
+          <name>Moorhead</name>
           <coordinates>46.873852 -96.767581</coordinates>
           <location>
             <name>Moorhead Municipal Airport</name>
@@ -38629,7 +38629,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Moose Lake</_name>
+          <name>Moose Lake</name>
           <coordinates>46.454113 -92.761866</coordinates>
           <location>
             <name>Moose Lake Carlton County Airport</name>
@@ -38639,7 +38639,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Mora</_name>
+          <name>Mora</name>
           <coordinates>45.876903 -93.293835</coordinates>
           <location>
             <name>Mora Municipal Airport</name>
@@ -38649,7 +38649,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Morris</_name>
+          <name msgctxt="City in Minnesota, United States">Morris</name>
           <coordinates>45.586072 -95.913941</coordinates>
           <location>
             <name>Morris Municipal Airport</name>
@@ -38659,7 +38659,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>New Ulm</_name>
+          <name>New Ulm</name>
           <coordinates>44.312463 -94.460529</coordinates>
           <location>
             <name>New Ulm Municipal Airport</name>
@@ -38669,7 +38669,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Olivia</_name>
+          <name>Olivia</name>
           <coordinates>44.776350 -94.989721</coordinates>
           <location>
             <name>Olivia Regional Airport</name>
@@ -38679,7 +38679,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Orr</_name>
+          <name>Orr</name>
           <coordinates>48.053527 -92.831002</coordinates>
           <location>
             <name>Orr</name>
@@ -38689,7 +38689,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Ortonville</_name>
+          <name>Ortonville</name>
           <coordinates>45.304687 -96.444779</coordinates>
           <location>
             <name>Ortonville Muncipal-Martinson Field Airport</name>
@@ -38699,7 +38699,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Owatonna</_name>
+          <name>Owatonna</name>
           <coordinates>44.083852 -93.226044</coordinates>
           <location>
             <name>Owatonna Degner Regional Airport</name>
@@ -38709,7 +38709,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Park Rapids</_name>
+          <name>Park Rapids</name>
           <coordinates>46.922181 -95.058632</coordinates>
           <location>
             <name>Park Rapids Municipal Airport</name>
@@ -38719,7 +38719,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Paynesville</_name>
+          <name>Paynesville</name>
           <coordinates>45.380520 -94.711948</coordinates>
           <location>
             <name>Paynesville Municipal Airport</name>
@@ -38729,7 +38729,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Pine River</_name>
+          <name>Pine River</name>
           <coordinates>46.718016 -94.404162</coordinates>
           <location>
             <name>Pine River Regional Airport</name>
@@ -38739,7 +38739,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Pipestone</_name>
+          <name>Pipestone</name>
           <coordinates>44.000526 -96.317534</coordinates>
           <location>
             <name>Pipestone Municipal Airport</name>
@@ -38749,7 +38749,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Preston</_name>
+          <name>Preston</name>
           <coordinates>43.670242 -92.083216</coordinates>
           <location>
             <name>Fillmore County Airport</name>
@@ -38759,7 +38759,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Princeton</_name>
+          <name msgctxt="City in Minnesota, United States">Princeton</name>
           <coordinates>45.569965 -93.581628</coordinates>
           <location>
             <name>Princeton</name>
@@ -38769,7 +38769,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Red Wing</_name>
+          <name>Red Wing</name>
           <coordinates>44.562468 -92.533801</coordinates>
           <location>
             <name>Red Wing Municipal Airport</name>
@@ -38779,7 +38779,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Redwood Falls</_name>
+          <name>Redwood Falls</name>
           <coordinates>44.539404 -95.116942</coordinates>
           <location>
             <name>Redwood Falls Municipal Airport</name>
@@ -38791,7 +38791,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Rochester</_name>
+          <name msgctxt="City in Minnesota, United States">Rochester</name>
           <coordinates>44.021631 -92.469899</coordinates>
           <location>
             <name>Rochester International Airport</name>
@@ -38803,7 +38803,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Roseau</_name>
+          <name msgctxt="City in Minnesota, United States">Roseau</name>
           <coordinates>48.846093 -95.762766</coordinates>
           <location>
             <name>Roseau Municipal Airport / Rudy Billberg Field</name>
@@ -38813,7 +38813,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Rush City</_name>
+          <name>Rush City</name>
           <coordinates>45.685514 -92.965490</coordinates>
           <location>
             <name>Rush City Regional Airport</name>
@@ -38823,7 +38823,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Saint Cloud</_name>
+          <name>Saint Cloud</name>
           <coordinates>45.560799 -94.162490</coordinates>
           <location>
             <name>St Cloud, St Cloud Regional Airport</name>
@@ -38835,7 +38835,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name msgctxt="City in Minnesota, United States">Saint James</_name>
+          <name msgctxt="City in Minnesota, United States">Saint James</name>
           <coordinates>43.982458 -94.626918</coordinates>
           <location>
             <name>St. James, St. James Municipal Airport</name>
@@ -38845,7 +38845,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Silver Bay</_name>
+          <name>Silver Bay</name>
           <coordinates>47.294365 -91.257386</coordinates>
           <location>
             <name>Silver Bay</name>
@@ -38855,7 +38855,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Slayton</_name>
+          <name>Slayton</name>
           <coordinates>43.987742 -95.755846</coordinates>
           <location>
             <name>Slayton Municipal Airport</name>
@@ -38865,7 +38865,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Stanton</_name>
+          <name>Stanton</name>
           <coordinates>44.471911 -93.022989</coordinates>
           <location>
             <name>Stanton Airfield</name>
@@ -38875,7 +38875,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Staples</_name>
+          <name>Staples</name>
           <coordinates>46.355519 -94.792241</coordinates>
           <location>
             <name>Staples Municipal Airport</name>
@@ -38885,7 +38885,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Thief River Falls</_name>
+          <name>Thief River Falls</name>
           <coordinates>48.119135 -96.181147</coordinates>
           <location>
             <name>Thief River Falls Regional Airport</name>
@@ -38897,7 +38897,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Tracy</_name>
+          <name>Tracy</name>
           <coordinates>44.233291 -95.619177</coordinates>
           <location>
             <name>Tracy Municipal Airport</name>
@@ -38907,7 +38907,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Two Harbors</_name>
+          <name>Two Harbors</name>
           <coordinates>47.022711 -91.670732</coordinates>
           <location>
             <name>Two Harbors</name>
@@ -38917,7 +38917,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Wadena</_name>
+          <name>Wadena</name>
           <coordinates>46.442461 -95.136139</coordinates>
           <location>
             <name>Wadena Municipal Airport</name>
@@ -38927,7 +38927,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Warroad</_name>
+          <name>Warroad</name>
           <coordinates>48.905266 -95.314404</coordinates>
           <location>
             <name>Warroad International Airport-Swede Carlston Field</name>
@@ -38939,7 +38939,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Waseca</_name>
+          <name>Waseca</name>
           <coordinates>44.077741 -93.507443</coordinates>
           <location>
             <name>Waseca Municipal Airport</name>
@@ -38949,7 +38949,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Waskish</_name>
+          <name>Waskish</name>
           <coordinates>48.161352 -94.512455</coordinates>
           <location>
             <name>Waskish Municipal Airport</name>
@@ -38959,7 +38959,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Wheaton</_name>
+          <name>Wheaton</name>
           <coordinates>45.804405 -96.499233</coordinates>
           <location>
             <name>Wheaton Municipal Airport</name>
@@ -38969,7 +38969,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Windom</_name>
+          <name>Windom</name>
           <coordinates>43.866346 -95.116937</coordinates>
           <location>
             <name>Windom Municipal Airport</name>
@@ -38979,7 +38979,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Winona</_name>
+          <name>Winona</name>
           <coordinates>44.049963 -91.639315</coordinates>
           <location>
             <name>Winona Municipal Airport-Max Conrad Field</name>
@@ -38989,7 +38989,7 @@
         </city>
         <city>
           <!-- A city in Minnesota in the United States -->
-          <_name>Worthington</_name>
+          <name>Worthington</name>
           <coordinates>43.619964 -95.596398</coordinates>
           <location>
             <name>Worthington Municipal Airport</name>
@@ -39002,12 +39002,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Mississippi</_name>
+        <name>Mississippi</name>
         <fips-code>US28</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Biloxi</_name>
+          <name>Biloxi</name>
           <coordinates>30.396032 -88.885308</coordinates>
           <location>
             <name>Keesler Air Force Base / Biloxi</name>
@@ -39017,7 +39017,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name msgctxt="City in Mississippi, United States">Columbus</_name>
+          <name msgctxt="City in Mississippi, United States">Columbus</name>
           <coordinates>33.495674 -88.427263</coordinates>
           <location>
             <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
@@ -39036,7 +39036,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name msgctxt="City in Mississippi, United States">Greenville</_name>
+          <name msgctxt="City in Mississippi, United States">Greenville</name>
           <coordinates>33.410116 -91.061774</coordinates>
           <location>
             <name>Mid Delta Regional Airport</name>
@@ -39047,7 +39047,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name msgctxt="City in Mississippi, United States">Greenwood</_name>
+          <name msgctxt="City in Mississippi, United States">Greenwood</name>
           <coordinates>33.516232 -90.179528</coordinates>
           <location>
             <name>Greenwood-LeFlore Airport</name>
@@ -39059,7 +39059,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Gulfport</_name>
+          <name>Gulfport</name>
           <coordinates>30.367420 -89.092816</coordinates>
           <location>
             <name>Gulfport-Biloxi Regional Airport</name>
@@ -39071,7 +39071,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Hattiesburg</_name>
+          <name>Hattiesburg</name>
           <coordinates>31.327119 -89.290339</coordinates>
           <location>
             <name>Bobby L Chain Municipal Airport</name>
@@ -39088,7 +39088,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name msgctxt="City in Mississippi, United States">Jackson</_name>
+          <name msgctxt="City in Mississippi, United States">Jackson</name>
           <coordinates>32.298757 -90.184810</coordinates>
           <location>
             <name>Hawkins Field Airport</name>
@@ -39105,7 +39105,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>McComb</_name>
+          <name>McComb</name>
           <coordinates>31.243787 -90.453154</coordinates>
           <location>
             <name>McComb / Pike County / John E Lewis Field Airport</name>
@@ -39117,7 +39117,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Meridian</_name>
+          <name>Meridian</name>
           <coordinates>32.364310 -88.703656</coordinates>
           <location>
             <name>Key Field</name>
@@ -39136,7 +39136,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Natchez</_name>
+          <name>Natchez</name>
           <coordinates>31.560444 -91.403171</coordinates>
           <location>
             <name>Hardy-Anders Field Natchez-Adams County Airport</name>
@@ -39148,7 +39148,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Olive Branch</_name>
+          <name>Olive Branch</name>
           <coordinates>34.961760 -89.829532</coordinates>
           <location>
             <name>Olive Branch Airport</name>
@@ -39158,7 +39158,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name msgctxt="City in Mississippi, United States">Oxford</_name>
+          <name msgctxt="City in Mississippi, United States">Oxford</name>
           <coordinates>34.366495 -89.519248</coordinates>
           <location>
             <name>University-Oxford Airport</name>
@@ -39168,7 +39168,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Pascagoula</_name>
+          <name>Pascagoula</name>
           <coordinates>30.365755 -88.556127</coordinates>
           <location>
             <name>Lott International Airport</name>
@@ -39178,7 +39178,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Tunica</_name>
+          <name>Tunica</name>
           <coordinates>34.684545 -90.382877</coordinates>
           <location>
             <name>Tunica Municipal Airport</name>
@@ -39188,7 +39188,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Tupelo</_name>
+          <name>Tupelo</name>
           <coordinates>34.257607 -88.703386</coordinates>
           <location>
             <name>Tupelo Regional Airport</name>
@@ -39200,7 +39200,7 @@
         </city>
         <city>
           <!-- A city in Mississippi in the United States -->
-          <_name>Vicksburg</_name>
+          <name>Vicksburg</name>
           <coordinates>32.352646 -90.877882</coordinates>
           <location>
             <name>Vicksburg / Tallulah Regional Airport</name>
@@ -39213,12 +39213,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Missouri</_name>
+        <name>Missouri</name>
         <fips-code>US29</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Cape Girardeau</_name>
+          <name>Cape Girardeau</name>
           <coordinates>37.305884 -89.518148</coordinates>
           <location>
             <name>Cape Girardeau Regional Airport</name>
@@ -39230,7 +39230,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Chesterfield</_name>
+          <name>Chesterfield</name>
           <coordinates>38.663108 -90.577067</coordinates>
           <location>
             <name>St. Louis, Spirit of St. Louis Airport</name>
@@ -39242,7 +39242,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Chillicothe</_name>
+          <name>Chillicothe</name>
           <coordinates>39.795295 -93.552436</coordinates>
           <location>
             <name>Chillicothe Agri-Science Center</name>
@@ -39253,7 +39253,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name msgctxt="City in Missouri, United States">Columbia</_name>
+          <name msgctxt="City in Missouri, United States">Columbia</name>
           <coordinates>38.951705 -92.334072</coordinates>
           <location>
             <name>Columbia Regional Airport</name>
@@ -39265,7 +39265,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name msgctxt="City in Missouri, United States">Farmington</_name>
+          <name msgctxt="City in Missouri, United States">Farmington</name>
           <coordinates>37.780885 -90.421790</coordinates>
           <location>
             <name>Farmington Airport</name>
@@ -39276,7 +39276,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Independence</_name>
+          <name>Independence</name>
           <coordinates>39.091116 -94.415507</coordinates>
           <location>
             <name>Lee's Summit, Lee's Summit Municipal Airport</name>
@@ -39287,7 +39287,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Jefferson City</_name>
+          <name>Jefferson City</name>
           <coordinates>38.576702 -92.173516</coordinates>
           <location>
             <name>Jefferson City Memorial Airport</name>
@@ -39299,7 +39299,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Joplin</_name>
+          <name>Joplin</name>
           <coordinates>37.084227 -94.513281</coordinates>
           <location>
             <name>Joplin Regional Airport</name>
@@ -39311,7 +39311,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Kaiser</_name>
+          <name>Kaiser</name>
           <coordinates>38.133645 -92.589906</coordinates>
           <location>
             <name>Kaiser Lake Ozark, Lee C Fine Memorial Airport</name>
@@ -39322,7 +39322,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name msgctxt="City in Missouri, United States">Kansas City</_name>
+          <name msgctxt="City in Missouri, United States">Kansas City</name>
           <coordinates>39.099727 -94.578567</coordinates>
           <location>
             <name>Kansas City Downtown Airport</name>
@@ -39334,7 +39334,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Kirksville</_name>
+          <name>Kirksville</name>
           <coordinates>40.194754 -92.583250</coordinates>
           <location>
             <name>Kirksville Regional Airport</name>
@@ -39346,7 +39346,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Knob Noster</_name>
+          <name>Knob Noster</name>
           <coordinates>38.766680 -93.558546</coordinates>
           <location>
             <name>Whiteman Air Force Base</name>
@@ -39358,7 +39358,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Poplar Bluff</_name>
+          <name>Poplar Bluff</name>
           <coordinates>36.756999 -90.392888</coordinates>
           <location>
             <name>Poplar Bluff Municipal Airport</name>
@@ -39368,7 +39368,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Sedalia</_name>
+          <name>Sedalia</name>
           <coordinates>38.704461 -93.228261</coordinates>
           <location>
             <name>Sedalia Memorial Airport</name>
@@ -39378,7 +39378,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name msgctxt="City in Missouri, United States">Springfield</_name>
+          <name msgctxt="City in Missouri, United States">Springfield</name>
           <coordinates>37.215326 -93.298244</coordinates>
           <location>
             <name>Springfield Regional Airport</name>
@@ -39390,7 +39390,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>St. Louis</_name>
+          <name>St. Louis</name>
           <coordinates>38.627222 -90.197778</coordinates>
           <location>
             <name>St. Louis, Lambert-St. Louis International Airport</name>
@@ -39402,7 +39402,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Unity Village</_name>
+          <name>Unity Village</name>
           <coordinates>38.951396 -94.401618</coordinates>
           <location>
             <name>Lee's Summit, Lee's Summit Municipal Airport</name>
@@ -39413,7 +39413,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name msgctxt="City in Missouri, United States">Vichy</_name>
+          <name msgctxt="City in Missouri, United States">Vichy</name>
           <coordinates>38.111432 -91.760439</coordinates>
           <location>
             <name>Rolla / Vichy, Rolla National Airport</name>
@@ -39425,7 +39425,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>Waynesville</_name>
+          <name>Waynesville</name>
           <coordinates>37.828652 -92.200723</coordinates>
           <location>
             <name>Fort Leonard Wood</name>
@@ -39437,7 +39437,7 @@
         </city>
         <city>
           <!-- A city in Missouri in the United States -->
-          <_name>West Plains</_name>
+          <name>West Plains</name>
           <coordinates>36.728115 -91.852371</coordinates>
           <location>
             <name>West Plains Municipal Airport</name>
@@ -39449,12 +39449,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Montana</_name>
+        <name>Montana</name>
         <fips-code>US30</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Baker</_name>
+          <name>Baker</name>
           <coordinates>46.366950 -104.284663</coordinates>
           <location>
             <name>Baker Municipal Airport</name>
@@ -39464,7 +39464,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Billings</_name>
+          <name>Billings</name>
           <coordinates>45.783286 -108.500690</coordinates>
           <location>
             <name>Billings Logan International Airport</name>
@@ -39476,7 +39476,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Black Eagle</_name>
+          <name>Black Eagle</name>
           <coordinates>47.524680 -111.278307</coordinates>
           <location>
             <name>Malmstrom Air Force Base</name>
@@ -39488,7 +39488,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Bozeman</_name>
+          <name>Bozeman</name>
           <coordinates>45.679653 -111.038558</coordinates>
           <location>
             <name>Gallatin Field</name>
@@ -39500,7 +39500,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Browning</_name>
+          <name>Browning</name>
           <coordinates>48.556917 -113.013418</coordinates>
           <location>
             <name>Browning, Starr-Browning Airstrip</name>
@@ -39510,7 +39510,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Butte</_name>
+          <name>Butte</name>
           <coordinates>46.003815 -112.534745</coordinates>
           <location>
             <name>Bert Mooney Airport</name>
@@ -39522,7 +39522,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Cut Bank</_name>
+          <name>Cut Bank</name>
           <coordinates>48.633040 -112.326162</coordinates>
           <location>
             <name>Cut Bank Municipal Airport</name>
@@ -39534,7 +39534,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Dillon</_name>
+          <name>Dillon</name>
           <coordinates>45.216311 -112.637520</coordinates>
           <location>
             <name>Dillon Airport</name>
@@ -39546,7 +39546,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Drummond</_name>
+          <name>Drummond</name>
           <coordinates>46.667431 -113.147286</coordinates>
           <location>
             <name>Drummond</name>
@@ -39558,7 +39558,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name msgctxt="City in Montana, United States">Glasgow</_name>
+          <name msgctxt="City in Montana, United States">Glasgow</name>
           <coordinates>48.196964 -106.636713</coordinates>
           <location>
             <name>Glasgow International Airport</name>
@@ -39570,7 +39570,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Glendive</_name>
+          <name>Glendive</name>
           <coordinates>47.105290 -104.712460</coordinates>
           <location>
             <name>Dawson Community Airport</name>
@@ -39582,7 +39582,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Great Falls</_name>
+          <name>Great Falls</name>
           <coordinates>47.500235 -111.300808</coordinates>
           <location>
             <name>Great Falls International Airport</name>
@@ -39592,7 +39592,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Havre</_name>
+          <name>Havre</name>
           <coordinates>48.549999 -109.684089</coordinates>
           <location>
             <name>Havre City-County Airport</name>
@@ -39604,7 +39604,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Helena</_name>
+          <name>Helena</name>
           <coordinates>46.592712 -112.036109</coordinates>
           <location>
             <name>Helena Regional Airport</name>
@@ -39616,7 +39616,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name msgctxt="City in Montana, United States">Jordan</_name>
+          <name msgctxt="City in Montana, United States">Jordan</name>
           <coordinates>47.320834 -106.910066</coordinates>
           <location>
             <name>Jordan Airport</name>
@@ -39628,7 +39628,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Kalispell</_name>
+          <name>Kalispell</name>
           <coordinates>48.195793 -114.312908</coordinates>
           <location>
             <name>Glacier Park International Airport</name>
@@ -39638,7 +39638,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Lewistown</_name>
+          <name>Lewistown</name>
           <coordinates>47.062473 -109.428238</coordinates>
           <location>
             <name>Lewistown Municipal Airport</name>
@@ -39650,7 +39650,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Livingston</_name>
+          <name>Livingston</name>
           <coordinates>45.662435 -110.561040</coordinates>
           <location>
             <name>Mission Field Airport</name>
@@ -39662,7 +39662,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Miles City</_name>
+          <name>Miles City</name>
           <coordinates>46.408336 -105.840558</coordinates>
           <location>
             <name>Frank Wiley Field Airport</name>
@@ -39674,7 +39674,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Missoula</_name>
+          <name>Missoula</name>
           <coordinates>46.872146 -113.993998</coordinates>
           <location>
             <name>Missoula International Airport</name>
@@ -39686,7 +39686,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name msgctxt="City in Montana, United States">Sidney</_name>
+          <name msgctxt="City in Montana, United States">Sidney</name>
           <coordinates>47.716684 -104.156325</coordinates>
           <location>
             <name>Sidney-Richland</name>
@@ -39698,7 +39698,7 @@
         </city>
         <city>
           <!-- A city in Montana in the United States -->
-          <_name>Wolf Point</_name>
+          <name>Wolf Point</name>
           <coordinates>48.090574 -105.640557</coordinates>
           <location>
             <name>Clayton Airport</name>
@@ -39711,12 +39711,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Nebraska</_name>
+        <name>Nebraska</name>
         <fips-code>US31</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Ainsworth</_name>
+          <name>Ainsworth</name>
           <coordinates>42.549999 -99.862624</coordinates>
           <location>
             <name>Ainsworth Municipal</name>
@@ -39728,7 +39728,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Albion</_name>
+          <name>Albion</name>
           <coordinates>41.690844 -98.003672</coordinates>
           <location>
             <name>Albion Municipal Airport</name>
@@ -39738,7 +39738,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Alliance</_name>
+          <name>Alliance</name>
           <coordinates>42.101634 -102.872145</coordinates>
           <location>
             <name>Alliance Municipal Airport</name>
@@ -39751,7 +39751,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Aurora</_name>
+          <name msgctxt="City in Nebraska, United States">Aurora</name>
           <coordinates>40.867234 -98.004221</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -39761,7 +39761,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Beatrice</_name>
+          <name>Beatrice</name>
           <coordinates>40.268056 -96.746970</coordinates>
           <location>
             <name>Beatrice Municipal</name>
@@ -39773,7 +39773,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Broken Bow</_name>
+          <name>Broken Bow</name>
           <coordinates>41.401951 -99.639279</coordinates>
           <location>
             <name>Broken Bow Municipal Airport</name>
@@ -39785,7 +39785,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Chadron</_name>
+          <name>Chadron</name>
           <coordinates>42.829419 -102.999907</coordinates>
           <location>
             <name>Chadron Municipal Airport</name>
@@ -39798,7 +39798,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Columbus</_name>
+          <name msgctxt="City in Nebraska, United States">Columbus</name>
           <coordinates>41.429734 -97.368375</coordinates>
           <location>
             <name>Columbus Municipal Airport</name>
@@ -39810,7 +39810,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Falls City</_name>
+          <name>Falls City</name>
           <coordinates>40.060835 -95.601929</coordinates>
           <location>
             <name>Brenner Field Airport</name>
@@ -39822,7 +39822,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Fremont</_name>
+          <name msgctxt="City in Nebraska, United States">Fremont</name>
           <coordinates>41.433333 -96.498081</coordinates>
           <location>
             <name>Fremont Municipal Airport</name>
@@ -39832,7 +39832,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Grand Island</_name>
+          <name>Grand Island</name>
           <coordinates>40.925012 -98.342007</coordinates>
           <location>
             <name>Central Nebraska Regional Airport</name>
@@ -39844,7 +39844,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Hastings</_name>
+          <name>Hastings</name>
           <coordinates>40.586125 -98.388393</coordinates>
           <location>
             <name>Hastings Municipal Airport</name>
@@ -39856,7 +39856,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Hebron</_name>
+          <name msgctxt="City in Nebraska, United States">Hebron</name>
           <coordinates>40.166393 -97.585875</coordinates>
           <location>
             <name>Hebron Municipal Airport</name>
@@ -39866,7 +39866,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Holdrege</_name>
+          <name>Holdrege</name>
           <coordinates>40.440289 -99.369822</coordinates>
           <location>
             <name>Brewster Field Airport</name>
@@ -39876,7 +39876,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Imperial</_name>
+          <name msgctxt="City in Nebraska, United States">Imperial</name>
           <coordinates>40.516940 -101.643225</coordinates>
           <location>
             <name>Imperial Municipal Airport</name>
@@ -39889,7 +39889,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Kearney</_name>
+          <name>Kearney</name>
           <coordinates>40.699457 -99.081477</coordinates>
           <location>
             <name>Kearney Municipal Airport</name>
@@ -39901,7 +39901,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Kimball</_name>
+          <name>Kimball</name>
           <coordinates>41.235814 -103.662997</coordinates>
           <location>
             <name>Kimball Municipal Airport / Robert E Arraj Field</name>
@@ -39912,7 +39912,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Lexington</_name>
+          <name msgctxt="City in Nebraska, United States">Lexington</name>
           <coordinates>40.780840 -99.741505</coordinates>
           <location>
             <name>Jim Kelly Field Airport</name>
@@ -39922,7 +39922,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Lincoln</_name>
+          <name msgctxt="City in Nebraska, United States">Lincoln</name>
           <coordinates>40.800001 -96.666960</coordinates>
           <location>
             <name>Lincoln Municipal Airport</name>
@@ -39934,7 +39934,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>McCook</_name>
+          <name>McCook</name>
           <coordinates>40.201948 -100.625708</coordinates>
           <location>
             <name>McCook Municipal Airport</name>
@@ -39947,7 +39947,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Nebraska City</_name>
+          <name>Nebraska City</name>
           <coordinates>40.676668 -95.859169</coordinates>
           <location>
             <name>Nebraska City Municipal Airport</name>
@@ -39957,7 +39957,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Norfolk</_name>
+          <name msgctxt="City in Nebraska, United States">Norfolk</name>
           <coordinates>42.028338 -97.416996</coordinates>
           <location>
             <name>Stefan Memorial Airport</name>
@@ -39969,7 +39969,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>North Platte</_name>
+          <name>North Platte</name>
           <coordinates>41.123887 -100.765423</coordinates>
           <location>
             <name>North Platte Regional Airport</name>
@@ -39981,7 +39981,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>O'Neill</_name>
+          <name>O'Neill</name>
           <coordinates>42.457781 -98.647587</coordinates>
           <location>
             <name>O'Neill / Baker Field</name>
@@ -39993,7 +39993,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Ogallala</_name>
+          <name>Ogallala</name>
           <coordinates>41.128048 -101.719618</coordinates>
           <location>
             <name>Searle Field Airport</name>
@@ -40004,7 +40004,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Omaha</_name>
+          <name>Omaha</name>
           <coordinates>41.258610 -95.937792</coordinates>
           <location>
             <name>Omaha, Eppley Airfield</name>
@@ -40030,7 +40030,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Ord</_name>
+          <name>Ord</name>
           <coordinates>41.603343 -98.926199</coordinates>
           <location>
             <name>Evelyn Sharp Field Airport</name>
@@ -40042,7 +40042,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Plattsmouth</_name>
+          <name>Plattsmouth</name>
           <coordinates>41.011388 -95.882231</coordinates>
           <location>
             <name>Plattsmouth Municipal Airport</name>
@@ -40052,7 +40052,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Scottsbluff</_name>
+          <name>Scottsbluff</name>
           <coordinates>41.866634 -103.667166</coordinates>
           <location>
             <name>Heilig Field</name>
@@ -40065,7 +40065,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">Sidney</_name>
+          <name msgctxt="City in Nebraska, United States">Sidney</name>
           <coordinates>41.142762 -102.977979</coordinates>
           <location>
             <name>Sidney Municipal Airport</name>
@@ -40077,7 +40077,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Tekamah</_name>
+          <name>Tekamah</name>
           <coordinates>41.778322 -96.221128</coordinates>
           <location>
             <name>Tekamah Municipal Airport</name>
@@ -40087,7 +40087,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Thedford</_name>
+          <name>Thedford</name>
           <coordinates>41.978332 -100.576252</coordinates>
           <location>
             <name>Thomas County Airport</name>
@@ -40097,7 +40097,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Valentine</_name>
+          <name>Valentine</name>
           <coordinates>42.872783 -100.550967</coordinates>
           <location>
             <name>Miller Field</name>
@@ -40109,7 +40109,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name>Wayne</_name>
+          <name>Wayne</name>
           <coordinates>42.230559 -97.017824</coordinates>
           <location>
             <name>Wayne Municipal Airport</name>
@@ -40119,7 +40119,7 @@
         </city>
         <city>
           <!-- A city in Nebraska in the United States -->
-          <_name msgctxt="City in Nebraska, United States">York</_name>
+          <name msgctxt="City in Nebraska, United States">York</name>
           <coordinates>40.868067 -97.591995</coordinates>
           <location>
             <name>York Municipal Airport</name>
@@ -40130,12 +40130,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Nevada</_name>
+        <name>Nevada</name>
         <fips-code>US32</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Elko</_name>
+          <name>Elko</name>
           <coordinates>40.832421 -115.763123</coordinates>
           <location>
             <name>Elko Regional Airport</name>
@@ -40147,7 +40147,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name msgctxt="City in Nevada, United States">Ely</_name>
+          <name msgctxt="City in Nevada, United States">Ely</name>
           <coordinates>39.247439 -114.888630</coordinates>
           <location>
             <name>Ely Airport</name>
@@ -40159,7 +40159,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name msgctxt="City in Nevada, United States">Eureka</_name>
+          <name msgctxt="City in Nevada, United States">Eureka</name>
           <coordinates>39.512707 -115.960613</coordinates>
           <location>
             <name>Eureka</name>
@@ -40171,7 +40171,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Fallon</_name>
+          <name>Fallon</name>
           <coordinates>39.473529 -118.777374</coordinates>
           <location>
             <name>Fallon, Naval Air Station</name>
@@ -40183,7 +40183,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name msgctxt="City in Nevada, United States">Henderson</_name>
+          <name msgctxt="City in Nevada, United States">Henderson</name>
           <coordinates>36.039699 -114.981937</coordinates>
           <location>
             <name>Las Vegas, Henderson Executive Airport</name>
@@ -40195,7 +40195,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name msgctxt="City in Nevada, United States">Las Vegas</_name>
+          <name msgctxt="City in Nevada, United States">Las Vegas</name>
           <coordinates>36.174971 -115.137223</coordinates>
           <location>
             <name>North Las Vegas Airport</name>
@@ -40221,7 +40221,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Lovelock</_name>
+          <name>Lovelock</name>
           <coordinates>40.179354 -118.473481</coordinates>
           <location>
             <name>Derby Field Airport</name>
@@ -40233,7 +40233,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Mercury</_name>
+          <name>Mercury</name>
           <coordinates>36.660511 -115.994475</coordinates>
           <location>
             <name>Desert Rock Airport</name>
@@ -40244,7 +40244,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>North Las Vegas</_name>
+          <name>North Las Vegas</name>
           <coordinates>36.198859 -115.117501</coordinates>
           <location>
             <name>Nellis Air Force Base</name>
@@ -40256,7 +40256,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Reno</_name>
+          <name>Reno</name>
           <coordinates>39.529633 -119.813803</coordinates>
           <location>
             <name>Reno Tahoe International Airport</name>
@@ -40268,7 +40268,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Tonopah</_name>
+          <name>Tonopah</name>
           <coordinates>38.067155 -117.230082</coordinates>
           <location>
             <name>Tonopah Airport</name>
@@ -40280,7 +40280,7 @@
         </city>
         <city>
           <!-- A city in Nevada in the United States -->
-          <_name>Winnemucca</_name>
+          <name>Winnemucca</name>
           <coordinates>40.972958 -117.735685</coordinates>
           <location>
             <name>Winnemucca Municipal Airport</name>
@@ -40293,12 +40293,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>New Hampshire</_name>
+        <name>New Hampshire</name>
         <fips-code>US33</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Berlin</_name>
+          <name msgctxt="City in New Hampshire, United States">Berlin</name>
           <coordinates>44.468670 -71.185077</coordinates>
           <location>
             <name>Berlin Municipal Airport</name>
@@ -40310,7 +40310,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Concord</_name>
+          <name msgctxt="City in New Hampshire, United States">Concord</name>
           <coordinates>43.208137 -71.537572</coordinates>
           <location>
             <name>Concord Municipal Airport</name>
@@ -40322,7 +40322,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Gorham</_name>
+          <name>Gorham</name>
           <coordinates>44.387839 -71.173131</coordinates>
           <location>
             <name>Mount Washington</name>
@@ -40333,7 +40333,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Jaffrey</_name>
+          <name>Jaffrey</name>
           <coordinates>42.813973 -72.023136</coordinates>
           <location>
             <name>Jaffrey Municipal-Silver Ranch Airport</name>
@@ -40345,7 +40345,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Keene</_name>
+          <name>Keene</name>
           <coordinates>42.933692 -72.278141</coordinates>
           <location>
             <name>Dillant-Hopkins Airport</name>
@@ -40357,7 +40357,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Laconia</_name>
+          <name>Laconia</name>
           <coordinates>43.527855 -71.470351</coordinates>
           <location>
             <name>Laconia Municipal Airport</name>
@@ -40369,7 +40369,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Lebanon</_name>
+          <name msgctxt="City in New Hampshire, United States">Lebanon</name>
           <coordinates>43.642293 -72.251757</coordinates>
           <location>
             <name>Lebanon Municipal Airport</name>
@@ -40381,7 +40381,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Manchester</_name>
+          <name msgctxt="City in New Hampshire, United States">Manchester</name>
           <coordinates>42.995640 -71.454789</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -40393,7 +40393,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Nashua</_name>
+          <name>Nashua</name>
           <coordinates>42.765366 -71.467566</coordinates>
           <location>
             <name>Boire Field Airport</name>
@@ -40405,7 +40405,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Plymouth</_name>
+          <name msgctxt="City in New Hampshire, United States">Plymouth</name>
           <coordinates>43.757017 -71.688134</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -40415,7 +40415,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Portsmouth</_name>
+          <name msgctxt="City in New Hampshire, United States">Portsmouth</name>
           <coordinates>43.071755 -70.762553</coordinates>
           <location>
             <name>Pease Air Force Base / Portsmouth</name>
@@ -40427,7 +40427,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name msgctxt="City in New Hampshire, United States">Rochester</_name>
+          <name msgctxt="City in New Hampshire, United States">Rochester</name>
           <coordinates>43.304526 -70.975619</coordinates>
           <location>
             <name>Skyhaven Airport</name>
@@ -40437,7 +40437,7 @@
         </city>
         <city>
           <!-- A city in New Hampshire in the United States -->
-          <_name>Whitefield</_name>
+          <name>Whitefield</name>
           <coordinates>44.373116 -71.610084</coordinates>
           <location>
             <name>Mount Washington Regional Airport</name>
@@ -40449,12 +40449,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>New Jersey</_name>
+        <name>New Jersey</name>
         <fips-code>US34</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Andover</_name>
+          <name>Andover</name>
           <coordinates>40.985931 -74.742109</coordinates>
           <location>
             <name>Aeroflex-Andover Airport</name>
@@ -40464,7 +40464,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Atlantic City</_name>
+          <name>Atlantic City</name>
           <coordinates>39.364283 -74.422927</coordinates>
           <location>
             <name>Atlantic City International Airport</name>
@@ -40476,7 +40476,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Belmar</_name>
+          <name>Belmar</name>
           <coordinates>40.178447 -74.021804</coordinates>
           <location>
             <name>Belmar-Farmingdale</name>
@@ -40488,7 +40488,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name msgctxt="City in New Jersey, United States">Caldwell</_name>
+          <name msgctxt="City in New Jersey, United States">Caldwell</name>
           <coordinates>40.839822 -74.276537</coordinates>
           <location>
             <name>Essex County Airport</name>
@@ -40500,7 +40500,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Elizabeth</_name>
+          <name>Elizabeth</name>
           <coordinates>40.663992 -74.210701</coordinates>
           <location>
             <name>Newark, Newark International Airport</name>
@@ -40512,7 +40512,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Jersey City</_name>
+          <name>Jersey City</name>
           <coordinates>40.728158 -74.077642</coordinates>
           <location>
             <name>Newark, Newark International Airport</name>
@@ -40524,7 +40524,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Juliustown</_name>
+          <name>Juliustown</name>
           <coordinates>40.013446 -74.668769</coordinates>
           <location>
             <name>Mcguire Air Force Base</name>
@@ -40536,7 +40536,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Millville</_name>
+          <name>Millville</name>
           <coordinates>39.402060 -75.039344</coordinates>
           <location>
             <name>Millville Municipal Airport</name>
@@ -40548,7 +40548,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Morristown</_name>
+          <name>Morristown</name>
           <coordinates>40.796767 -74.481544</coordinates>
           <location>
             <name>Morristown Municipal</name>
@@ -40560,7 +40560,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Mount Holly</_name>
+          <name>Mount Holly</name>
           <coordinates>39.992890 -74.787662</coordinates>
           <location>
             <name>South Jersey Regional Airport</name>
@@ -40571,7 +40571,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name msgctxt="City in New Jersey, United States">Newark</_name>
+          <name msgctxt="City in New Jersey, United States">Newark</name>
           <coordinates>40.735657 -74.172367</coordinates>
           <location>
             <name>Newark International Airport</name>
@@ -40583,7 +40583,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Paterson</_name>
+          <name>Paterson</name>
           <coordinates>40.916765 -74.171811</coordinates>
           <location>
             <name>Caldwell, Essex County Airport</name>
@@ -40595,7 +40595,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Somerville</_name>
+          <name>Somerville</name>
           <coordinates>40.574270 -74.609880</coordinates>
           <location>
             <name>Somerset Airport</name>
@@ -40605,7 +40605,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Sussex</_name>
+          <name>Sussex</name>
           <coordinates>41.209818 -74.607661</coordinates>
           <location>
             <name>Sussex Airport</name>
@@ -40615,7 +40615,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name>Teterboro</_name>
+          <name>Teterboro</name>
           <coordinates>40.859822 -74.059308</coordinates>
           <location>
             <name>Teterboro Airport</name>
@@ -40627,7 +40627,7 @@
         </city>
         <city>
           <!-- A city in New Jersey in the United States -->
-          <_name msgctxt="City in New Jersey, United States">Trenton</_name>
+          <name msgctxt="City in New Jersey, United States">Trenton</name>
           <coordinates>40.217053 -74.742938</coordinates>
           <location>
             <name>Mercer County Airport</name>
@@ -40640,12 +40640,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>New Mexico</_name>
+        <name>New Mexico</name>
         <fips-code>US35</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Alamogordo</_name>
+          <name>Alamogordo</name>
           <coordinates>32.899532 -105.960265</coordinates>
           <location>
             <name>Alamogordo-White</name>
@@ -40662,7 +40662,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Albuquerque</_name>
+          <name>Albuquerque</name>
           <coordinates>35.084491 -106.651137</coordinates>
           <location>
             <name>Albuquerque International Airport</name>
@@ -40681,7 +40681,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Artesia</_name>
+          <name>Artesia</name>
           <coordinates>32.842334 -104.403296</coordinates>
           <location>
             <name>Artesia Municipal Airport</name>
@@ -40691,7 +40691,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name msgctxt="City in New Mexico, United States">Carlsbad</_name>
+          <name msgctxt="City in New Mexico, United States">Carlsbad</name>
           <coordinates>32.420674 -104.228837</coordinates>
           <location>
             <name>Cavern City Air Terminal Airport</name>
@@ -40703,7 +40703,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Chama</_name>
+          <name>Chama</name>
           <coordinates>36.903068 -106.579479</coordinates>
           <location>
             <name>Chama</name>
@@ -40713,7 +40713,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Clayton</_name>
+          <name>Clayton</name>
           <coordinates>36.451693 -103.184104</coordinates>
           <location>
             <name>Clayton Municipal Airpark</name>
@@ -40725,7 +40725,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Clines Corners</_name>
+          <name>Clines Corners</name>
           <coordinates>35.009498 -105.669180</coordinates>
           <location>
             <name>Clines Corners</name>
@@ -40735,7 +40735,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Clovis</_name>
+          <name>Clovis</name>
           <coordinates>34.404799 -103.205227</coordinates>
           <location>
             <name>Cannon Air Force Base / Clovis</name>
@@ -40754,7 +40754,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name msgctxt="City in New Mexico, United States">Corona</_name>
+          <name msgctxt="City in New Mexico, United States">Corona</name>
           <coordinates>34.250907 -105.596669</coordinates>
           <location>
             <name>Corona / Lincoln</name>
@@ -40766,7 +40766,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Deming</_name>
+          <name>Deming</name>
           <coordinates>32.268698 -107.758640</coordinates>
           <location>
             <name>Deming Municipal Airport</name>
@@ -40778,7 +40778,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name msgctxt="City in New Mexico, United States">Farmington</_name>
+          <name msgctxt="City in New Mexico, United States">Farmington</name>
           <coordinates>36.728058 -108.218686</coordinates>
           <location>
             <name>Four Corners Regional Airport</name>
@@ -40790,7 +40790,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Gallup</_name>
+          <name>Gallup</name>
           <coordinates>35.528078 -108.742584</coordinates>
           <location>
             <name>Gallup Municipal Airport</name>
@@ -40802,7 +40802,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Grants</_name>
+          <name>Grants</name>
           <coordinates>35.147260 -107.851447</coordinates>
           <location>
             <name>Grants-Milan Municipal Airport</name>
@@ -40814,7 +40814,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Hobbs</_name>
+          <name>Hobbs</name>
           <coordinates>32.702612 -103.136040</coordinates>
           <location>
             <name>Hobbs / Lea County</name>
@@ -40826,7 +40826,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Las Cruces</_name>
+          <name>Las Cruces</name>
           <coordinates>32.312316 -106.778337</coordinates>
           <location>
             <name>Las Cruces International Airport</name>
@@ -40836,7 +40836,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name msgctxt="City in New Mexico, United States">Las Vegas</_name>
+          <name msgctxt="City in New Mexico, United States">Las Vegas</name>
           <coordinates>35.593933 -105.223897</coordinates>
           <location>
             <name>Las Vegas Municipal Airport</name>
@@ -40848,7 +40848,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Los Alamos</_name>
+          <name>Los Alamos</name>
           <coordinates>35.888080 -106.306972</coordinates>
           <location>
             <name>Los Alamos Airport</name>
@@ -40860,7 +40860,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Moriarty</_name>
+          <name>Moriarty</name>
           <coordinates>34.990050 -106.049189</coordinates>
           <location>
             <name>Moriarty</name>
@@ -40872,7 +40872,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Raton</_name>
+          <name>Raton</name>
           <coordinates>36.903358 -104.439153</coordinates>
           <location>
             <name>Raton Municipal / Crews Field Airport</name>
@@ -40882,7 +40882,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Roswell</_name>
+          <name>Roswell</name>
           <coordinates>33.394266 -104.523024</coordinates>
           <location>
             <name>Roswell Industrial Air Center Airport</name>
@@ -40894,7 +40894,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Ruidoso</_name>
+          <name>Ruidoso</name>
           <coordinates>33.331749 -105.673041</coordinates>
           <location>
             <name>Ruidoso Regional</name>
@@ -40904,7 +40904,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Santa Fe</_name>
+          <name>Santa Fe</name>
           <coordinates>35.686975 -105.937799</coordinates>
           <location>
             <name>Santa Fe County Municipal Airport</name>
@@ -40916,7 +40916,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Silver City</_name>
+          <name>Silver City</name>
           <coordinates>32.770075 -108.280326</coordinates>
           <location>
             <name>Silver City / Grant</name>
@@ -40928,7 +40928,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Taos</_name>
+          <name>Taos</name>
           <coordinates>36.407249 -105.573066</coordinates>
           <location>
             <name>Taos Regional Airport</name>
@@ -40938,7 +40938,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Torreon</_name>
+          <name>Torreon</name>
           <coordinates>35.797244 -107.213933</coordinates>
           <location>
             <name>Torreon</name>
@@ -40950,7 +40950,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Truth or Consequences</_name>
+          <name>Truth or Consequences</name>
           <coordinates>33.128405 -107.252807</coordinates>
           <location>
             <name>Truth Or Consequences, Truth Or Consequences Municipal Airport</name>
@@ -40962,7 +40962,7 @@
         </city>
         <city>
           <!-- A city in New Mexico in the United States -->
-          <_name>Tucumcari</_name>
+          <name>Tucumcari</name>
           <coordinates>35.171723 -103.724966</coordinates>
           <location>
             <name>Tucumcari Municipal Airport</name>
@@ -40975,12 +40975,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name msgctxt="State in United States">New York</_name>
+        <name msgctxt="State in United States">New York</name>
         <fips-code>US36</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Albany</_name>
+          <name msgctxt="City in New York, United States">Albany</name>
           <coordinates>42.652579 -73.756232</coordinates>
           <location>
             <name>Albany International Airport</name>
@@ -40992,7 +40992,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Binghamton</_name>
+          <name>Binghamton</name>
           <coordinates>42.098687 -75.917974</coordinates>
           <location>
             <name>Binghamton Regional Airport</name>
@@ -41004,7 +41004,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Black River</_name>
+          <name>Black River</name>
           <coordinates>44.012564 -75.794367</coordinates>
           <location>
             <name>Fort Drum / Wheeler-Sack U. S. Army Airfield</name>
@@ -41016,7 +41016,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Buffalo</_name>
+          <name msgctxt="City in New York, United States">Buffalo</name>
           <coordinates>42.886447 -78.878369</coordinates>
           <location>
             <name>Greater Buffalo International Airport</name>
@@ -41028,7 +41028,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Dansville</_name>
+          <name>Dansville</name>
           <coordinates>42.560900 -77.696106</coordinates>
           <location>
             <name>Dansville Municipal Airport</name>
@@ -41038,7 +41038,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Dunkirk</_name>
+          <name>Dunkirk</name>
           <coordinates>42.479502 -79.333932</coordinates>
           <location>
             <name>Chautauqua County / Dunkirk Airport</name>
@@ -41048,7 +41048,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>East Hampton</_name>
+          <name>East Hampton</name>
           <coordinates>40.963434 -72.184801</coordinates>
           <location>
             <name>East Hampton Airport</name>
@@ -41058,7 +41058,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Elmira</_name>
+          <name msgctxt="City in New York, United States">Elmira</name>
           <coordinates>42.089796 -76.807734</coordinates>
           <location>
             <name>Elmira / Corning Regional Airport</name>
@@ -41070,7 +41070,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Farmingdale</_name>
+          <name>Farmingdale</name>
           <coordinates>40.732600 -73.445401</coordinates>
           <location>
             <name>Republic Airport</name>
@@ -41082,7 +41082,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Fulton</_name>
+          <name>Fulton</name>
           <coordinates>43.322846 -76.417158</coordinates>
           <location>
             <name>Oswego County Airport</name>
@@ -41092,7 +41092,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Glens Falls</_name>
+          <name>Glens Falls</name>
           <coordinates>43.309516 -73.644006</coordinates>
           <location>
             <name>Floyd Bennett Memorial Airport</name>
@@ -41104,7 +41104,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Islip</_name>
+          <name>Islip</name>
           <coordinates>40.729821 -73.210393</coordinates>
           <location>
             <name>Long Island Mac Arthur Airport</name>
@@ -41116,7 +41116,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Ithaca</_name>
+          <name>Ithaca</name>
           <coordinates>42.440628 -76.496607</coordinates>
           <location>
             <name>Ithaca Tompkins Regional Airport</name>
@@ -41128,7 +41128,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Jamestown</_name>
+          <name msgctxt="City in New York, United States">Jamestown</name>
           <coordinates>42.097002 -79.235326</coordinates>
           <location>
             <name>Chautauqua County / Jamestown Airport</name>
@@ -41140,7 +41140,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Massena</_name>
+          <name>Massena</name>
           <coordinates>44.928105 -74.891865</coordinates>
           <location>
             <name>Massena International-Richards Field</name>
@@ -41152,7 +41152,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Montauk</_name>
+          <name>Montauk</name>
           <coordinates>41.035935 -71.954515</coordinates>
           <location>
             <name>Montauk Airport</name>
@@ -41162,7 +41162,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Montgomery</_name>
+          <name msgctxt="City in New York, United States">Montgomery</name>
           <coordinates>41.527594 -74.236816</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -41174,7 +41174,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Monticello</_name>
+          <name msgctxt="City in New York, United States">Monticello</name>
           <coordinates>41.655647 -74.689328</coordinates>
           <location>
             <name>Sullivan County International Airport</name>
@@ -41186,7 +41186,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">New York</_name>
+          <name msgctxt="City in New York, United States">New York</name>
           <coordinates>40.714269 -74.005973</coordinates>
           <location>
             <name>New York City, Central Park</name>
@@ -41212,7 +41212,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Newburgh</_name>
+          <name>Newburgh</name>
           <coordinates>41.503427 -74.010418</coordinates>
           <location>
             <name>Newburgh / Stewart</name>
@@ -41224,7 +41224,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Niagara Falls</_name>
+          <name>Niagara Falls</name>
           <coordinates>43.094500 -79.056711</coordinates>
           <location>
             <name>Niagara Falls International Airport</name>
@@ -41236,7 +41236,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Penn Yan</_name>
+          <name>Penn Yan</name>
           <coordinates>42.660903 -77.053858</coordinates>
           <location>
             <name>Penn Yan Airport</name>
@@ -41247,7 +41247,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Plattsburgh</_name>
+          <name>Plattsburgh</name>
           <coordinates>44.699487 -73.452912</coordinates>
           <location>
             <name>Plattsburgh Air Force Base</name>
@@ -41257,7 +41257,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Poughkeepsie</_name>
+          <name>Poughkeepsie</name>
           <coordinates>41.700371 -73.920970</coordinates>
           <location>
             <name>Dutchess County Airport</name>
@@ -41269,7 +41269,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Rochester</_name>
+          <name msgctxt="City in New York, United States">Rochester</name>
           <coordinates>43.154784 -77.615557</coordinates>
           <location>
             <name>Greater Rochester International Airport</name>
@@ -41281,7 +41281,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Rome</_name>
+          <name msgctxt="City in New York, United States">Rome</name>
           <coordinates>43.212847 -75.455730</coordinates>
           <location>
             <name>Griffiss Air Force Base / Rome</name>
@@ -41291,7 +41291,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Saranac Lake</_name>
+          <name>Saranac Lake</name>
           <coordinates>44.329496 -74.131266</coordinates>
           <location>
             <name>Adirondack Regional Airport</name>
@@ -41303,7 +41303,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Shirley</_name>
+          <name>Shirley</name>
           <coordinates>40.801488 -72.867603</coordinates>
           <location>
             <name>Brookhaven Airport</name>
@@ -41313,7 +41313,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Syracuse</_name>
+          <name>Syracuse</name>
           <coordinates>43.048122 -76.147424</coordinates>
           <location>
             <name>Syracuse Hancock International Airport</name>
@@ -41325,7 +41325,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name msgctxt="City in New York, United States">Watertown</_name>
+          <name msgctxt="City in New York, United States">Watertown</name>
           <coordinates>43.974784 -75.910757</coordinates>
           <location>
             <name>Watertown International Airport</name>
@@ -41337,7 +41337,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Wellsville</_name>
+          <name>Wellsville</name>
           <coordinates>42.122012 -77.948058</coordinates>
           <location>
             <name>Wellsville Municipal Airport</name>
@@ -41347,7 +41347,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Westhampton Beach</_name>
+          <name>Westhampton Beach</name>
           <coordinates>40.803155 -72.614539</coordinates>
           <location>
             <name>The Gabreski Airport</name>
@@ -41359,7 +41359,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>White Plains</_name>
+          <name>White Plains</name>
           <coordinates>41.033986 -73.762910</coordinates>
           <location>
             <name>Westchester County Airport</name>
@@ -41371,7 +41371,7 @@
         </city>
         <city>
           <!-- A city in New York in the United States -->
-          <_name>Yonkers</_name>
+          <name>Yonkers</name>
           <coordinates>40.931210 -73.898747</coordinates>
           <location>
             <name>Teterboro, Teterboro Airport</name>
@@ -41384,12 +41384,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>North Carolina</_name>
+        <name>North Carolina</name>
         <fips-code>US37</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Adamsville</_name>
+          <name>Adamsville</name>
           <coordinates>35.370995 -77.953319</coordinates>
           <location>
             <name>Seymour-Johnson Air Force Base</name>
@@ -41401,7 +41401,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Ahoskie</_name>
+          <name>Ahoskie</name>
           <coordinates>36.286822 -76.984681</coordinates>
           <location>
             <name>Tri-County Airport</name>
@@ -41411,7 +41411,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Albemarle</_name>
+          <name>Albemarle</name>
           <coordinates>35.350143 -80.200058</coordinates>
           <location>
             <name>Stanly County Airport</name>
@@ -41421,7 +41421,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Andrews</_name>
+          <name>Andrews</name>
           <coordinates>35.201755 -83.824067</coordinates>
           <location>
             <name>Andrews-Murphy Airport</name>
@@ -41431,7 +41431,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Asheboro</_name>
+          <name>Asheboro</name>
           <coordinates>35.707915 -79.813645</coordinates>
           <location>
             <name>Asheboro Municipal Airport</name>
@@ -41441,7 +41441,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Asheville</_name>
+          <name>Asheville</name>
           <coordinates>35.600945 -82.554015</coordinates>
           <location>
             <name>Asheville Regional Airport</name>
@@ -41453,7 +41453,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Beaufort</_name>
+          <name msgctxt="City in North Carolina, United States">Beaufort</name>
           <coordinates>34.718217 -76.663819</coordinates>
           <location>
             <name>Michael J Smith Field Airport</name>
@@ -41463,7 +41463,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Bogue</_name>
+          <name>Bogue</name>
           <coordinates>34.699329 -77.036891</coordinates>
           <location>
             <name>Swansboro, Bogue Field, Marine Corps Auxiliary Landing Field</name>
@@ -41473,7 +41473,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Boone</_name>
+          <name msgctxt="City in North Carolina, United States">Boone</name>
           <coordinates>36.216795 -81.674552</coordinates>
           <location>
             <name>Watauga County Hospital Heliport</name>
@@ -41483,7 +41483,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Burlington</_name>
+          <name msgctxt="City in North Carolina, United States">Burlington</name>
           <coordinates>36.095692 -79.437799</coordinates>
           <location>
             <name>Burlington Alamance Regional Airport</name>
@@ -41493,7 +41493,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Chapel Hill</_name>
+          <name>Chapel Hill</name>
           <coordinates>35.913200 -79.055845</coordinates>
           <location>
             <name>Williams Airport</name>
@@ -41503,7 +41503,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Charlotte</_name>
+          <name msgctxt="City in North Carolina, United States">Charlotte</name>
           <coordinates>35.227087 -80.843127</coordinates>
           <location>
             <name>Charlotte / Douglas International Airport</name>
@@ -41515,7 +41515,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Clinton</_name>
+          <name msgctxt="City in North Carolina, United States">Clinton</name>
           <coordinates>34.997945 -78.323333</coordinates>
           <location>
             <name>Sampson County Airport</name>
@@ -41525,7 +41525,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Concord</_name>
+          <name msgctxt="City in North Carolina, United States">Concord</name>
           <coordinates>35.408752 -80.579511</coordinates>
           <location>
             <name>Concord Regional Airport</name>
@@ -41535,7 +41535,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Currituck</_name>
+          <name>Currituck</name>
           <coordinates>36.449877 -76.015482</coordinates>
           <location>
             <name>Currituck County Airport</name>
@@ -41545,7 +41545,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Durham</_name>
+          <name>Durham</name>
           <coordinates>35.994033 -78.898619</coordinates>
           <location>
             <name>Raleigh / Durham, Raleigh-Durham International Airport</name>
@@ -41557,7 +41557,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Edenton</_name>
+          <name>Edenton</name>
           <coordinates>36.057938 -76.607721</coordinates>
           <location>
             <name>Northeastern Regional Airport</name>
@@ -41567,7 +41567,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Elizabeth City</_name>
+          <name>Elizabeth City</name>
           <coordinates>36.294601 -76.251046</coordinates>
           <location>
             <name>Elizabeth City Coast Guard Air Station</name>
@@ -41579,7 +41579,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Elizabethtown</_name>
+          <name>Elizabethtown</name>
           <coordinates>34.629337 -78.605290</coordinates>
           <location>
             <name>Curtis L Brown Jr. Field Airport</name>
@@ -41589,7 +41589,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Erwin</_name>
+          <name>Erwin</name>
           <coordinates>35.326829 -78.676128</coordinates>
           <location>
             <name>Harnett County Airport</name>
@@ -41599,7 +41599,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Fayetteville</_name>
+          <name msgctxt="City in North Carolina, United States">Fayetteville</name>
           <coordinates>35.052664 -78.878359</coordinates>
           <location>
             <name>Fayetteville Regional Airport</name>
@@ -41625,7 +41625,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Franklin</_name>
+          <name msgctxt="City in North Carolina, United States">Franklin</name>
           <coordinates>35.182317 -83.381543</coordinates>
           <location>
             <name>Macon County Airport</name>
@@ -41635,7 +41635,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Gastonia</_name>
+          <name>Gastonia</name>
           <coordinates>35.262082 -81.187301</coordinates>
           <location>
             <name>Gastonia Municipal Airport</name>
@@ -41645,7 +41645,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Goldsboro</_name>
+          <name>Goldsboro</name>
           <coordinates>35.384884 -77.992765</coordinates>
           <location>
             <name>Goldsboro-Wayne Municipal Airport</name>
@@ -41657,7 +41657,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Greensboro</_name>
+          <name msgctxt="City in North Carolina, United States">Greensboro</name>
           <coordinates>36.072635 -79.791975</coordinates>
           <location>
             <name>Piedmont Triad International Airport</name>
@@ -41669,7 +41669,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Hatteras</_name>
+          <name>Hatteras</name>
           <coordinates>35.219342 -75.690161</coordinates>
           <location>
             <name>Mitchell Field</name>
@@ -41679,7 +41679,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Havelock</_name>
+          <name>Havelock</name>
           <coordinates>34.879049 -76.901330</coordinates>
           <location>
             <name>Cherry Point, Marine Corps Air Station</name>
@@ -41690,7 +41690,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Hickory</_name>
+          <name>Hickory</name>
           <coordinates>35.733188 -81.341197</coordinates>
           <location>
             <name>Hickory Regional Airport</name>
@@ -41702,7 +41702,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Hoffman</_name>
+          <name>Hoffman</name>
           <coordinates>35.032378 -79.547544</coordinates>
           <location>
             <name>Mackall U. S. Army Airfield</name>
@@ -41713,7 +41713,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Jacksonville</_name>
+          <name msgctxt="City in North Carolina, United States">Jacksonville</name>
           <coordinates>34.754052 -77.430241</coordinates>
           <location>
             <name>Jacksonville, New River, Marine Corps Air Station</name>
@@ -41725,7 +41725,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Jefferson</_name>
+          <name>Jefferson</name>
           <coordinates>36.420403 -81.473438</coordinates>
           <location>
             <name>Ashe County Airport</name>
@@ -41735,7 +41735,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Kenansville</_name>
+          <name>Kenansville</name>
           <coordinates>34.962388 -77.962207</coordinates>
           <location>
             <name>Duplin County Airport</name>
@@ -41745,7 +41745,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Kill Devil Hills</_name>
+          <name>Kill Devil Hills</name>
           <coordinates>36.030723 -75.676010</coordinates>
           <location>
             <name>First Flight Airport</name>
@@ -41755,7 +41755,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Kinston</_name>
+          <name>Kinston</name>
           <coordinates>35.262664 -77.581635</coordinates>
           <location>
             <name>Kinston Regional Jetport at Stallings Field</name>
@@ -41767,7 +41767,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Lexington</_name>
+          <name msgctxt="City in North Carolina, United States">Lexington</name>
           <coordinates>35.824027 -80.253384</coordinates>
           <location>
             <name>Davidson County Airport</name>
@@ -41777,7 +41777,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Louisburg</_name>
+          <name>Louisburg</name>
           <coordinates>36.099039 -78.301106</coordinates>
           <location>
             <name>Franklin County Airport</name>
@@ -41787,7 +41787,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Lumberton</_name>
+          <name>Lumberton</name>
           <coordinates>34.618220 -79.008642</coordinates>
           <location>
             <name>Lumberton Municipal Airport</name>
@@ -41797,7 +41797,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Manteo</_name>
+          <name>Manteo</name>
           <coordinates>35.908226 -75.675730</coordinates>
           <location>
             <name>Manteo / Dare County Regional</name>
@@ -41807,7 +41807,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Maxton</_name>
+          <name>Maxton</name>
           <coordinates>34.735161 -79.348932</coordinates>
           <location>
             <name>Laurinburg-Maxton Airport</name>
@@ -41817,7 +41817,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Monroe</_name>
+          <name msgctxt="City in North Carolina, United States">Monroe</name>
           <coordinates>34.985428 -80.549511</coordinates>
           <location>
             <name>Monroe Airport</name>
@@ -41827,7 +41827,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Mount Airy</_name>
+          <name>Mount Airy</name>
           <coordinates>36.499301 -80.607286</coordinates>
           <location>
             <name>Mount Airy / Surry County Airport</name>
@@ -41837,7 +41837,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>New Bern</_name>
+          <name>New Bern</name>
           <coordinates>35.108493 -77.044114</coordinates>
           <location>
             <name>Craven County Regional Airport</name>
@@ -41849,7 +41849,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>North Wilkesboro</_name>
+          <name>North Wilkesboro</name>
           <coordinates>36.158465 -81.147584</coordinates>
           <location>
             <name>Wilkes County Airport</name>
@@ -41859,7 +41859,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Oak Island</_name>
+          <name>Oak Island</name>
           <coordinates>33.916562 -78.161106</coordinates>
           <location>
             <name>Brunswick County Airport</name>
@@ -41869,7 +41869,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Oxford</_name>
+          <name msgctxt="City in North Carolina, United States">Oxford</name>
           <coordinates>36.310700 -78.590834</coordinates>
           <location>
             <name>Henderson-Oxford Airport</name>
@@ -41879,7 +41879,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Pinehurst</_name>
+          <name>Pinehurst</name>
           <coordinates>35.195434 -79.469477</coordinates>
           <location>
             <name>Pinehurst / Southern Pines, Moore County Airport</name>
@@ -41889,7 +41889,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Raleigh</_name>
+          <name>Raleigh</name>
           <coordinates>35.772096 -78.638615</coordinates>
           <location>
             <name>Raleigh / Durham, Raleigh-Durham International Airport</name>
@@ -41901,7 +41901,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Roanoke Rapids</_name>
+          <name>Roanoke Rapids</name>
           <coordinates>36.461540 -77.654146</coordinates>
           <location>
             <name>Halifax County Airport</name>
@@ -41911,7 +41911,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Rocky Mount</_name>
+          <name>Rocky Mount</name>
           <coordinates>35.938210 -77.790534</coordinates>
           <location>
             <name>Rocky Mount-Wilson Regional Airport</name>
@@ -41923,7 +41923,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Roe</_name>
+          <name>Roe</name>
           <coordinates>34.992387 -76.308803</coordinates>
           <location>
             <name>Piney Island, Bt-11 Bombing Range</name>
@@ -41933,7 +41933,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Roxboro</_name>
+          <name>Roxboro</name>
           <coordinates>36.393752 -78.982788</coordinates>
           <location>
             <name>Person County Airport</name>
@@ -41943,7 +41943,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Salisbury</_name>
+          <name msgctxt="City in North Carolina, United States">Salisbury</name>
           <coordinates>35.670973 -80.474226</coordinates>
           <location>
             <name>Rowan County Airport</name>
@@ -41953,7 +41953,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Sanford</_name>
+          <name msgctxt="City in North Carolina, United States">Sanford</name>
           <coordinates>35.479876 -79.180299</coordinates>
           <location>
             <name>Sanford-Lee County Regional Airport</name>
@@ -41963,7 +41963,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Shelby</_name>
+          <name>Shelby</name>
           <coordinates>35.292351 -81.535646</coordinates>
           <location>
             <name>Shelby Municipal Airport</name>
@@ -41973,7 +41973,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Smithfield</_name>
+          <name>Smithfield</name>
           <coordinates>35.508494 -78.339445</coordinates>
           <location>
             <name>Johnston County Airport</name>
@@ -41983,7 +41983,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Statesville</_name>
+          <name>Statesville</name>
           <coordinates>35.782636 -80.887296</coordinates>
           <location>
             <name>Statesville Municipal Airport</name>
@@ -41993,7 +41993,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Wadesboro</_name>
+          <name>Wadesboro</name>
           <coordinates>34.968210 -80.076727</coordinates>
           <location>
             <name>Anson County Airport</name>
@@ -42003,7 +42003,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Washington</_name>
+          <name msgctxt="City in North Carolina, United States">Washington</name>
           <coordinates>35.546552 -77.052174</coordinates>
           <location>
             <name>Warren Field Airport</name>
@@ -42013,7 +42013,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name msgctxt="City in North Carolina, United States">Wilmington</_name>
+          <name msgctxt="City in North Carolina, United States">Wilmington</name>
           <coordinates>34.225726 -77.944710</coordinates>
           <location>
             <name>Wilmington International Airport</name>
@@ -42025,7 +42025,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Winston-Salem</_name>
+          <name>Winston-Salem</name>
           <coordinates>36.099860 -80.244216</coordinates>
           <location>
             <name>Winston Salem, Smith Reynolds Airport</name>
@@ -42037,7 +42037,7 @@
         </city>
         <city>
           <!-- A city in North Carolina in the United States -->
-          <_name>Winterville</_name>
+          <name>Winterville</name>
           <coordinates>35.529051 -77.401076</coordinates>
           <location>
             <name>Pitt-Greenville Airport</name>
@@ -42048,12 +42048,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>North Dakota</_name>
+        <name>North Dakota</name>
         <fips-code>US38</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Bismarck</_name>
+          <name>Bismarck</name>
           <coordinates>46.808327 -100.783739</coordinates>
           <location>
             <name>Bismarck Municipal Airport</name>
@@ -42065,7 +42065,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Bowman</_name>
+          <name>Bowman</name>
           <coordinates>46.183062 -103.394906</coordinates>
           <location>
             <name>Bowman Municipal Airport</name>
@@ -42075,7 +42075,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Devils Lake</_name>
+          <name>Devils Lake</name>
           <coordinates>48.112779 -98.865120</coordinates>
           <location>
             <name>Devils Lake Municipal Airport</name>
@@ -42087,7 +42087,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Dickinson</_name>
+          <name>Dickinson</name>
           <coordinates>46.879176 -102.789624</coordinates>
           <location>
             <name>Dickinson Municipal Airport</name>
@@ -42100,7 +42100,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Fargo</_name>
+          <name>Fargo</name>
           <coordinates>46.877186 -96.789803</coordinates>
           <location>
             <name>Hector International Airport</name>
@@ -42112,7 +42112,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Garrison</_name>
+          <name>Garrison</name>
           <coordinates>47.652223 -101.415717</coordinates>
           <location>
             <name>Garrison</name>
@@ -42122,7 +42122,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Grand Forks</_name>
+          <name>Grand Forks</name>
           <coordinates>47.925257 -97.032855</coordinates>
           <location>
             <name>Grand Forks International Airport</name>
@@ -42141,7 +42141,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Hettinger</_name>
+          <name>Hettinger</name>
           <coordinates>46.001395 -102.636824</coordinates>
           <location>
             <name>Hettinger Municipal Airport</name>
@@ -42152,7 +42152,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name msgctxt="City in North Dakota, United States">Jamestown</_name>
+          <name msgctxt="City in North Dakota, United States">Jamestown</name>
           <coordinates>46.910544 -98.708436</coordinates>
           <location>
             <name>Jamestown Municipal Airport</name>
@@ -42164,7 +42164,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Minot</_name>
+          <name>Minot</name>
           <coordinates>48.232509 -101.296273</coordinates>
           <location>
             <name>Minot International Airport</name>
@@ -42176,7 +42176,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Wahpeton</_name>
+          <name>Wahpeton</name>
           <coordinates>46.265237 -96.605907</coordinates>
           <location>
             <name>Harry Stern Airport</name>
@@ -42186,7 +42186,7 @@
         </city>
         <city>
           <!-- A city in North Dakota in the United States -->
-          <_name>Williston</_name>
+          <name>Williston</name>
           <coordinates>48.146968 -103.617975</coordinates>
           <location>
             <name>Sloulin Field International Airport</name>
@@ -42199,12 +42199,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Ohio</_name>
+        <name>Ohio</name>
         <fips-code>US39</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Akron</_name>
+          <name msgctxt="City in Ohio, United States">Akron</name>
           <coordinates>41.081445 -81.519005</coordinates>
           <location>
             <name>Akron Fulton International Airport</name>
@@ -42223,7 +42223,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Ashtabula</_name>
+          <name>Ashtabula</name>
           <coordinates>41.865053 -80.789809</coordinates>
           <location>
             <name>Ashtabula County Airport</name>
@@ -42233,7 +42233,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Cincinnati</_name>
+          <name>Cincinnati</name>
           <coordinates>39.162004 -84.456886</coordinates>
           <location>
             <name>Cincinnati Municipal Airport, Lunken Field</name>
@@ -42252,7 +42252,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Cleveland</_name>
+          <name>Cleveland</name>
           <coordinates>41.499495 -81.695409</coordinates>
           <location>
             <name>Burke Lakefront Airport</name>
@@ -42278,7 +42278,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Columbus</_name>
+          <name msgctxt="City in Ohio, United States">Columbus</name>
           <coordinates>39.961176 -82.998794</coordinates>
           <location>
             <name>Port Columbus International Airport</name>
@@ -42311,7 +42311,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Dayton</_name>
+          <name>Dayton</name>
           <coordinates>39.758948 -84.191607</coordinates>
           <location>
             <name>Dayton / Wright-Patterson Air Force Base</name>
@@ -42337,7 +42337,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Defiance</_name>
+          <name>Defiance</name>
           <coordinates>41.284493 -84.355780</coordinates>
           <location>
             <name>Defiance Memorial Airport</name>
@@ -42347,7 +42347,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Elyria</_name>
+          <name>Elyria</name>
           <coordinates>41.368380 -82.107649</coordinates>
           <location>
             <name>Lorain / Elyria, Lorain County Regional Airport</name>
@@ -42357,7 +42357,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Findlay</_name>
+          <name>Findlay</name>
           <coordinates>41.044220 -83.649932</coordinates>
           <location>
             <name>Findlay Airport</name>
@@ -42369,7 +42369,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Hamilton</_name>
+          <name msgctxt="City in Ohio, United States">Hamilton</name>
           <coordinates>39.399501 -84.561335</coordinates>
           <location>
             <name>Butler County Regional Airport</name>
@@ -42381,7 +42381,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Lancaster</_name>
+          <name msgctxt="City in Ohio, United States">Lancaster</name>
           <coordinates>39.713675 -82.599329</coordinates>
           <location>
             <name>Fairfield County Airport</name>
@@ -42393,7 +42393,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Lima</_name>
+          <name msgctxt="City in Ohio, United States">Lima</name>
           <coordinates>40.742551 -84.105226</coordinates>
           <location>
             <name>Lima Allen County Airport</name>
@@ -42403,7 +42403,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Mansfield</_name>
+          <name>Mansfield</name>
           <coordinates>40.758390 -82.515447</coordinates>
           <location>
             <name>Mansfield Lahm Municipal Airport</name>
@@ -42415,7 +42415,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Marion</_name>
+          <name msgctxt="City in Ohio, United States">Marion</name>
           <coordinates>40.588670 -83.128524</coordinates>
           <location>
             <name>Marion Municipal Airport</name>
@@ -42425,7 +42425,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>New Philadelphia</_name>
+          <name>New Philadelphia</name>
           <coordinates>40.489787 -81.445671</coordinates>
           <location>
             <name>Harry Clever Field</name>
@@ -42435,7 +42435,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Newark</_name>
+          <name msgctxt="City in Ohio, United States">Newark</name>
           <coordinates>40.058121 -82.401264</coordinates>
           <location>
             <name>Newark Heath Airport</name>
@@ -42445,7 +42445,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Springfield</_name>
+          <name msgctxt="City in Ohio, United States">Springfield</name>
           <coordinates>39.924227 -83.808817</coordinates>
           <location>
             <name>Springfield-Beckley Municipal Airport</name>
@@ -42455,7 +42455,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Toledo</_name>
+          <name>Toledo</name>
           <coordinates>41.663938 -83.555212</coordinates>
           <location>
             <name>Metcalf Field</name>
@@ -42474,7 +42474,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name msgctxt="City in Ohio, United States">Wilmington</_name>
+          <name msgctxt="City in Ohio, United States">Wilmington</name>
           <coordinates>39.445339 -83.828537</coordinates>
           <location>
             <name>Airborne Airpark Airport</name>
@@ -42486,7 +42486,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Wooster</_name>
+          <name>Wooster</name>
           <coordinates>40.805056 -81.935143</coordinates>
           <location>
             <name>Wayne County Airport</name>
@@ -42498,7 +42498,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Youngstown</_name>
+          <name>Youngstown</name>
           <coordinates>41.099780 -80.649519</coordinates>
           <location>
             <name>Youngstown-Warren Regional Airport</name>
@@ -42510,7 +42510,7 @@
         </city>
         <city>
           <!-- A city in Ohio in the United States -->
-          <_name>Zanesville</_name>
+          <name>Zanesville</name>
           <coordinates>39.940345 -82.013192</coordinates>
           <location>
             <name>Zanesville Municipal Airport</name>
@@ -42523,12 +42523,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Oklahoma</_name>
+        <name>Oklahoma</name>
         <fips-code>US40</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Ada</_name>
+          <name>Ada</name>
           <coordinates>34.774531 -96.678345</coordinates>
           <location>
             <name>Ada Municipal Airport</name>
@@ -42538,7 +42538,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Altus</_name>
+          <name>Altus</name>
           <coordinates>34.638126 -99.333975</coordinates>
           <location>
             <name>Altus Air Force Base</name>
@@ -42555,7 +42555,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Alva</_name>
+          <name>Alva</name>
           <coordinates>36.805031 -98.666474</coordinates>
           <location>
             <name>Alva Regional Airport</name>
@@ -42565,7 +42565,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Ardmore</_name>
+          <name>Ardmore</name>
           <coordinates>34.174261 -97.143625</coordinates>
           <location>
             <name>Ardmore Downtown Executive Airport</name>
@@ -42584,7 +42584,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Atoka</_name>
+          <name>Atoka</name>
           <coordinates>34.385926 -96.128325</coordinates>
           <location>
             <name>Atoka Municipal Airport</name>
@@ -42594,7 +42594,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Bartlesville</_name>
+          <name>Bartlesville</name>
           <coordinates>36.747311 -95.980818</coordinates>
           <location>
             <name>Bartlesville Municipal Airport</name>
@@ -42606,7 +42606,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name msgctxt="City in Oklahoma, United States">Chandler</_name>
+          <name msgctxt="City in Oklahoma, United States">Chandler</name>
           <coordinates>35.701731 -96.880858</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -42616,7 +42616,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Chickasha</_name>
+          <name>Chickasha</name>
           <coordinates>35.052565 -97.936433</coordinates>
           <location>
             <name>Chickasha Municipal Airport</name>
@@ -42626,7 +42626,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Claremore</_name>
+          <name>Claremore</name>
           <coordinates>36.312596 -95.616090</coordinates>
           <location>
             <name>Claremore Regional Airport</name>
@@ -42636,7 +42636,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name msgctxt="City in Oklahoma, United States">Clinton</_name>
+          <name msgctxt="City in Oklahoma, United States">Clinton</name>
           <coordinates>35.515606 -98.967307</coordinates>
           <location>
             <name>Clinton Regional Airport</name>
@@ -42653,7 +42653,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Cushing</_name>
+          <name>Cushing</name>
           <coordinates>35.985064 -96.766970</coordinates>
           <location>
             <name>Cushing Municipal Airport</name>
@@ -42663,7 +42663,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Duncan</_name>
+          <name>Duncan</name>
           <coordinates>34.502303 -97.957813</coordinates>
           <location>
             <name>Halliburton Field Airport</name>
@@ -42673,7 +42673,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Durant</_name>
+          <name>Durant</name>
           <coordinates>33.993986 -96.370824</coordinates>
           <location>
             <name>Eaker Field Airport</name>
@@ -42683,7 +42683,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>El Reno</_name>
+          <name>El Reno</name>
           <coordinates>35.532274 -97.955049</coordinates>
           <location>
             <name>El Reno Regional Airport</name>
@@ -42693,7 +42693,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Enid</_name>
+          <name>Enid</name>
           <coordinates>36.395589 -97.878391</coordinates>
           <location>
             <name>Vance Air Force Base / Enid</name>
@@ -42712,7 +42712,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name msgctxt="City in Oklahoma, United States">Frederick</_name>
+          <name msgctxt="City in Oklahoma, United States">Frederick</name>
           <coordinates>34.392026 -99.018409</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -42722,7 +42722,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Gage</_name>
+          <name>Gage</name>
           <coordinates>36.315594 -99.757618</coordinates>
           <location>
             <name>Gage Airport</name>
@@ -42734,7 +42734,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Grove</_name>
+          <name>Grove</name>
           <coordinates>36.593686 -94.769119</coordinates>
           <location>
             <name>Grove Municipal Airport</name>
@@ -42744,7 +42744,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Guthrie</_name>
+          <name>Guthrie</name>
           <coordinates>35.878937 -97.425319</coordinates>
           <location>
             <name>Guthrie Municipal Airport</name>
@@ -42754,7 +42754,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Guymon</_name>
+          <name>Guymon</name>
           <coordinates>36.682804 -101.481549</coordinates>
           <location>
             <name>Guymon Municipal Airport</name>
@@ -42765,7 +42765,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name msgctxt="City in Oklahoma, United States">Hobart</_name>
+          <name msgctxt="City in Oklahoma, United States">Hobart</name>
           <coordinates>35.029501 -99.093132</coordinates>
           <location>
             <name>Hobart Municipal Airport</name>
@@ -42777,7 +42777,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Idabel</_name>
+          <name>Idabel</name>
           <coordinates>33.895665 -94.826328</coordinates>
           <location>
             <name>McCurtain County Regional Airport</name>
@@ -42787,7 +42787,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Lawton</_name>
+          <name>Lawton</name>
           <coordinates>34.608685 -98.390331</coordinates>
           <location>
             <name>Fort Sill</name>
@@ -42806,7 +42806,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>McAlester</_name>
+          <name>McAlester</name>
           <coordinates>34.933430 -95.769713</coordinates>
           <location>
             <name>McAlester Regional Airport</name>
@@ -42818,7 +42818,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Muskogee</_name>
+          <name>Muskogee</name>
           <coordinates>35.747877 -95.369691</coordinates>
           <location>
             <name>Davis Field</name>
@@ -42828,7 +42828,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Norman</_name>
+          <name>Norman</name>
           <coordinates>35.222567 -97.439478</coordinates>
           <location>
             <name>Norman / Max Westheimer</name>
@@ -42838,7 +42838,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Oklahoma City</_name>
+          <name>Oklahoma City</name>
           <coordinates>35.467560 -97.516428</coordinates>
           <location>
             <name>Will Rogers World Airport</name>
@@ -42864,7 +42864,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Okmulgee</_name>
+          <name>Okmulgee</name>
           <coordinates>35.623437 -95.960550</coordinates>
           <location>
             <name>Okmulgee Municipal Airport</name>
@@ -42874,7 +42874,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Pauls Valley</_name>
+          <name>Pauls Valley</name>
           <coordinates>34.740081 -97.222245</coordinates>
           <location>
             <name>Pauls Valley Municipal Airport</name>
@@ -42884,7 +42884,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Ponca City</_name>
+          <name>Ponca City</name>
           <coordinates>36.706981 -97.085595</coordinates>
           <location>
             <name>Ponca City Municipal Airport</name>
@@ -42896,7 +42896,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Poteau</_name>
+          <name>Poteau</name>
           <coordinates>35.053709 -94.623558</coordinates>
           <location>
             <name>Robert S Kerr Airport</name>
@@ -42906,7 +42906,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Sallisaw</_name>
+          <name>Sallisaw</name>
           <coordinates>35.460371 -94.787446</coordinates>
           <location>
             <name>Sallisaw Municipal Airport</name>
@@ -42916,7 +42916,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name msgctxt="City in Oklahoma, United States">Seminole</_name>
+          <name msgctxt="City in Oklahoma, United States">Seminole</name>
           <coordinates>35.224520 -96.670573</coordinates>
           <location>
             <name>Seminole Municipal Airport</name>
@@ -42926,7 +42926,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Shawnee</_name>
+          <name>Shawnee</name>
           <coordinates>35.327293 -96.925300</coordinates>
           <location>
             <name>Shawnee Municipal Airport</name>
@@ -42936,7 +42936,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Stillwater</_name>
+          <name>Stillwater</name>
           <coordinates>36.115607 -97.058368</coordinates>
           <location>
             <name>Stillwater Regional Airport</name>
@@ -42948,7 +42948,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Tahlequah</_name>
+          <name>Tahlequah</name>
           <coordinates>35.915370 -94.969956</coordinates>
           <location>
             <name>Tahlequah Municipal Airport</name>
@@ -42958,7 +42958,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Tulsa</_name>
+          <name>Tulsa</name>
           <coordinates>36.153982 -95.992775</coordinates>
           <location>
             <name>Tulsa International Airport</name>
@@ -42977,7 +42977,7 @@
         </city>
         <city>
           <!-- A city in Oklahoma in the United States -->
-          <_name>Weatherford</_name>
+          <name>Weatherford</name>
           <coordinates>35.526163 -98.707574</coordinates>
           <location>
             <name>Thomas P Stafford Airport</name>
@@ -42988,12 +42988,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Oregon</_name>
+        <name>Oregon</name>
         <fips-code>US41</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Astoria</_name>
+          <name>Astoria</name>
           <coordinates>46.187884 -123.831253</coordinates>
           <location>
             <name>Astoria Regional Airport</name>
@@ -43005,7 +43005,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Aurora</_name>
+          <name msgctxt="City in Oregon, United States">Aurora</name>
           <coordinates>45.230954 -122.755927</coordinates>
           <location>
             <name>Aurora State Airport</name>
@@ -43017,7 +43017,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Baker City</_name>
+          <name>Baker City</name>
           <coordinates>44.774875 -117.834385</coordinates>
           <location>
             <name>Baker City Municipal Airport</name>
@@ -43029,7 +43029,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Brookings</_name>
+          <name msgctxt="City in Oregon, United States">Brookings</name>
           <coordinates>42.052611 -124.283982</coordinates>
           <location>
             <name>Brookings Airport</name>
@@ -43039,7 +43039,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Burns</_name>
+          <name>Burns</name>
           <coordinates>43.586261 -119.054103</coordinates>
           <location>
             <name>Burns Municipal Airport</name>
@@ -43051,7 +43051,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Corvallis</_name>
+          <name>Corvallis</name>
           <coordinates>44.564566 -123.262044</coordinates>
           <location>
             <name>Corvallis Municipal Airport</name>
@@ -43061,7 +43061,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Eugene</_name>
+          <name>Eugene</name>
           <coordinates>44.052069 -123.086754</coordinates>
           <location>
             <name>Mahlon Sweet Field</name>
@@ -43073,7 +43073,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Hermiston</_name>
+          <name>Hermiston</name>
           <coordinates>45.840410 -119.289461</coordinates>
           <location>
             <name>Hermiston Municipal Airport</name>
@@ -43083,7 +43083,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Klamath Falls</_name>
+          <name>Klamath Falls</name>
           <coordinates>42.224867 -121.781670</coordinates>
           <location>
             <name>Klamath Falls International Airport</name>
@@ -43095,7 +43095,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>La Grande</_name>
+          <name>La Grande</name>
           <coordinates>45.324577 -118.087719</coordinates>
           <location>
             <name>La Grande / Union County Airport</name>
@@ -43105,7 +43105,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Lakeview</_name>
+          <name>Lakeview</name>
           <coordinates>42.188772 -120.345792</coordinates>
           <location>
             <name>Lake County Airport</name>
@@ -43117,7 +43117,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>McMinnville</_name>
+          <name>McMinnville</name>
           <coordinates>45.210116 -123.198716</coordinates>
           <location>
             <name>McMinnville Municipal Airport</name>
@@ -43127,7 +43127,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Meacham</_name>
+          <name>Meacham</name>
           <coordinates>45.506519 -118.421349</coordinates>
           <location>
             <name>Meacham</name>
@@ -43139,7 +43139,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Medford</_name>
+          <name msgctxt="City in Oregon, United States">Medford</name>
           <coordinates>42.326515 -122.875595</coordinates>
           <location>
             <name>Rogue Valley International Airport</name>
@@ -43151,7 +43151,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Newport</_name>
+          <name msgctxt="City in Oregon, United States">Newport</name>
           <coordinates>44.636784 -124.053450</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -43163,7 +43163,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>North Bend</_name>
+          <name>North Bend</name>
           <coordinates>43.406501 -124.224280</coordinates>
           <location>
             <name>North Bend Municipal Airport</name>
@@ -43175,7 +43175,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Ontario</_name>
+          <name msgctxt="City in Oregon, United States">Ontario</name>
           <coordinates>44.026553 -116.962938</coordinates>
           <location>
             <name>Ontario Municipal Airport</name>
@@ -43188,7 +43188,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Pendleton</_name>
+          <name>Pendleton</name>
           <coordinates>45.672075 -118.788597</coordinates>
           <location>
             <name>Eastern Oregon Regional At Pendleton Airport</name>
@@ -43200,7 +43200,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Placer</_name>
+          <name>Placer</name>
           <coordinates>42.632063 -123.315339</coordinates>
           <location>
             <name>Sexton Summit</name>
@@ -43212,7 +43212,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Portland</_name>
+          <name msgctxt="City in Oregon, United States">Portland</name>
           <coordinates>45.523452 -122.676207</coordinates>
           <location>
             <name>Portland International Airport</name>
@@ -43238,7 +43238,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Redmond</_name>
+          <name>Redmond</name>
           <coordinates>44.272620 -121.173921</coordinates>
           <location>
             <name>Roberts Field Airport</name>
@@ -43250,7 +43250,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Rome</_name>
+          <name msgctxt="City in Oregon, United States">Rome</name>
           <coordinates>42.839045 -117.628211</coordinates>
           <location>
             <name>Rome</name>
@@ -43261,7 +43261,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Roseburg</_name>
+          <name>Roseburg</name>
           <coordinates>43.216505 -123.341738</coordinates>
           <location>
             <name>Roseburg Regional Airport</name>
@@ -43273,7 +43273,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name msgctxt="City in Oregon, United States">Salem</_name>
+          <name msgctxt="City in Oregon, United States">Salem</name>
           <coordinates>44.942898 -123.035096</coordinates>
           <location>
             <name>McNary Field</name>
@@ -43285,7 +43285,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>Scappoose</_name>
+          <name>Scappoose</name>
           <coordinates>45.754281 -122.877604</coordinates>
           <location>
             <name>Scappoose Industrial Airpark</name>
@@ -43295,7 +43295,7 @@
         </city>
         <city>
           <!-- A city in Oregon in the United States -->
-          <_name>The Dalles</_name>
+          <name>The Dalles</name>
           <coordinates>45.594564 -121.178682</coordinates>
           <location>
             <name>Columbia Gorge Regional / The Dalles Municipal Airport</name>
@@ -43308,12 +43308,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Pennsylvania</_name>
+        <name>Pennsylvania</name>
         <fips-code>US42</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Allentown</_name>
+          <name>Allentown</name>
           <coordinates>40.608430 -75.490183</coordinates>
           <location>
             <name>Lehigh Valley International Airport</name>
@@ -43325,7 +43325,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Altoona</_name>
+          <name>Altoona</name>
           <coordinates>40.518681 -78.394736</coordinates>
           <location>
             <name>Altoona-Blair County Airport</name>
@@ -43337,7 +43337,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Beaver Falls</_name>
+          <name>Beaver Falls</name>
           <coordinates>40.752010 -80.319230</coordinates>
           <location>
             <name>Beaver Falls Airport</name>
@@ -43347,7 +43347,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Bradford</_name>
+          <name>Bradford</name>
           <coordinates>41.955896 -78.643916</coordinates>
           <location>
             <name>Bradford Regional Airport</name>
@@ -43359,7 +43359,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Butler</_name>
+          <name>Butler</name>
           <coordinates>40.861176 -79.895333</coordinates>
           <location>
             <name>Butler County Airport / K W Scholter Field</name>
@@ -43369,7 +43369,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Clearfield</_name>
+          <name>Clearfield</name>
           <coordinates>41.027280 -78.439188</coordinates>
           <location>
             <name>Clearfield-Lawrence Airport</name>
@@ -43379,7 +43379,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Doylestown</_name>
+          <name>Doylestown</name>
           <coordinates>40.310106 -75.129894</coordinates>
           <location>
             <name>Doylestown Airport</name>
@@ -43389,7 +43389,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Du Bois</_name>
+          <name>Du Bois</name>
           <coordinates>41.119228 -78.760030</coordinates>
           <location>
             <name>Du Bois-Jefferson County Airport</name>
@@ -43401,7 +43401,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Erie</_name>
+          <name>Erie</name>
           <coordinates>42.129224 -80.085059</coordinates>
           <location>
             <name>Erie International Airport</name>
@@ -43413,7 +43413,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">Franklin</_name>
+          <name msgctxt="City in Pennsylvania, United States">Franklin</name>
           <coordinates>41.397836 -79.831444</coordinates>
           <location>
             <name>Venango Regional Airport</name>
@@ -43425,7 +43425,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">Harrisburg</_name>
+          <name msgctxt="City in Pennsylvania, United States">Harrisburg</name>
           <coordinates>40.273700 -76.884418</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -43444,7 +43444,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">Indiana</_name>
+          <name msgctxt="City in Pennsylvania, United States">Indiana</name>
           <coordinates>40.621455 -79.152535</coordinates>
           <location>
             <name>Indiana / Stewart Field</name>
@@ -43454,7 +43454,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Indiantown</_name>
+          <name>Indiantown</name>
           <coordinates>40.409812 -76.580244</coordinates>
           <location>
             <name>Muir Army Air Field / Indiantown</name>
@@ -43466,7 +43466,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Johnstown</_name>
+          <name>Johnstown</name>
           <coordinates>40.326741 -78.921970</coordinates>
           <location>
             <name>Johnstown-Cambria County Airport</name>
@@ -43478,7 +43478,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">Lancaster</_name>
+          <name msgctxt="City in Pennsylvania, United States">Lancaster</name>
           <coordinates>40.037875 -76.305514</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -43490,7 +43490,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Latrobe</_name>
+          <name>Latrobe</name>
           <coordinates>40.321181 -79.379481</coordinates>
           <location>
             <name>Latrobe / Westmorland</name>
@@ -43502,7 +43502,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Meadville</_name>
+          <name>Meadville</name>
           <coordinates>41.641444 -80.151448</coordinates>
           <location>
             <name>Port Meadville Airport</name>
@@ -43512,7 +43512,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Mount Pocono</_name>
+          <name>Mount Pocono</name>
           <coordinates>41.122034 -75.364628</coordinates>
           <location>
             <name>Pocono Mountains Municipal Airport</name>
@@ -43522,7 +43522,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>New Castle</_name>
+          <name>New Castle</name>
           <coordinates>41.003672 -80.347009</coordinates>
           <location>
             <name>New Castle Municipal Airport</name>
@@ -43532,7 +43532,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Philadelphia</_name>
+          <name>Philadelphia</name>
           <coordinates>39.952335 -75.163789</coordinates>
           <location>
             <name>Philadelphia International Airport</name>
@@ -43556,7 +43556,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Pittsburgh</_name>
+          <name>Pittsburgh</name>
           <coordinates>40.440625 -79.995886</coordinates>
           <location>
             <name>Allegheny County Airport</name>
@@ -43575,7 +43575,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Pottstown</_name>
+          <name>Pottstown</name>
           <coordinates>40.245374 -75.649630</coordinates>
           <location>
             <name>Pottstown Limerick Airport</name>
@@ -43585,7 +43585,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Quakertown</_name>
+          <name>Quakertown</name>
           <coordinates>40.441768 -75.341567</coordinates>
           <location>
             <name>Quakertown Airport</name>
@@ -43595,7 +43595,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Reading</_name>
+          <name>Reading</name>
           <coordinates>40.335648 -75.926875</coordinates>
           <location>
             <name>Reading Regional Airport</name>
@@ -43607,7 +43607,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Selinsgrove</_name>
+          <name>Selinsgrove</name>
           <coordinates>40.798974 -76.862194</coordinates>
           <location>
             <name>Penn Valley Airport</name>
@@ -43617,7 +43617,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>State College</_name>
+          <name>State College</name>
           <coordinates>40.793395 -77.860001</coordinates>
           <location>
             <name>University Park Airport</name>
@@ -43629,7 +43629,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">Washington</_name>
+          <name msgctxt="City in Pennsylvania, United States">Washington</name>
           <coordinates>40.173960 -80.246171</coordinates>
           <location>
             <name>Washington County Airport</name>
@@ -43639,7 +43639,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Wilkes-Barre</_name>
+          <name>Wilkes-Barre</name>
           <coordinates>41.245915 -75.881308</coordinates>
           <location>
             <name>Wilkes-Barre - Scranton, Wilkes-Barre / Scranton International Airport</name>
@@ -43651,7 +43651,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Williamsport</_name>
+          <name>Williamsport</name>
           <coordinates>41.241190 -77.001079</coordinates>
           <location>
             <name>Williamsport Regional Airport</name>
@@ -43663,7 +43663,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name>Willow Grove</_name>
+          <name>Willow Grove</name>
           <coordinates>40.143999 -75.115729</coordinates>
           <location>
             <name>Willow Grove, Naval Air Station</name>
@@ -43673,7 +43673,7 @@
         </city>
         <city>
           <!-- A city in Pennsylvania in the United States -->
-          <_name msgctxt="City in Pennsylvania, United States">York</_name>
+          <name msgctxt="City in Pennsylvania, United States">York</name>
           <coordinates>39.962598 -76.727745</coordinates>
           <location>
             <name>York Airport</name>
@@ -43684,12 +43684,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Rhode Island</_name>
+        <name>Rhode Island</name>
         <fips-code>US44</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Rhode Island in the United States -->
-          <_name msgctxt="City in Rhode Island, United States">Newport</_name>
+          <name msgctxt="City in Rhode Island, United States">Newport</name>
           <coordinates>41.490102 -71.312828</coordinates>
           <location>
             <name>Newport State Airport</name>
@@ -43699,7 +43699,7 @@
         </city>
         <city>
           <!-- A city in Rhode Island in the United States -->
-          <_name>Pawtucket</_name>
+          <name>Pawtucket</name>
           <coordinates>41.878711 -71.382556</coordinates>
           <location>
             <name>North Central State Airport</name>
@@ -43711,7 +43711,7 @@
         </city>
         <city>
           <!-- A city in Rhode Island in the United States -->
-          <_name>Providence</_name>
+          <name>Providence</name>
           <coordinates>41.823989 -71.412834</coordinates>
           <location>
             <name>Theodore Francis Green State Airport</name>
@@ -43730,7 +43730,7 @@
         </city>
         <city>
           <!-- A city in Rhode Island in the United States -->
-          <_name>Westerly</_name>
+          <name>Westerly</name>
           <coordinates>41.377600 -71.827291</coordinates>
           <location>
             <name>Westerly State Airport</name>
@@ -43741,12 +43741,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>South Carolina</_name>
+        <name>South Carolina</name>
         <fips-code>US45</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Anderson</_name>
+          <name msgctxt="City in South Carolina, United States">Anderson</name>
           <coordinates>34.503439 -82.650133</coordinates>
           <location>
             <name>Anderson County Airport</name>
@@ -43758,7 +43758,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Beaufort</_name>
+          <name msgctxt="City in South Carolina, United States">Beaufort</name>
           <coordinates>32.431581 -80.669829</coordinates>
           <location>
             <name>Beaufort, Marine Corps Air Station</name>
@@ -43770,7 +43770,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Charleston</_name>
+          <name msgctxt="City in South Carolina, United States">Charleston</name>
           <coordinates>32.776566 -79.930922</coordinates>
           <location>
             <name>Charleston Air Force Base</name>
@@ -43782,7 +43782,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Clemson</_name>
+          <name>Clemson</name>
           <coordinates>34.683438 -82.837365</coordinates>
           <location>
             <name>Clemson-Oconee County Airport</name>
@@ -43792,7 +43792,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Columbia</_name>
+          <name msgctxt="City in South Carolina, United States">Columbia</name>
           <coordinates>34.000710 -81.034814</coordinates>
           <location>
             <name>Columbia Owens Downtown Airport</name>
@@ -43818,7 +43818,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Dalzell</_name>
+          <name>Dalzell</name>
           <coordinates>34.016821 -80.430082</coordinates>
           <location>
             <name>Shaw Air Force Base</name>
@@ -43830,7 +43830,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Darlington</_name>
+          <name>Darlington</name>
           <coordinates>34.299876 -79.876174</coordinates>
           <location>
             <name>Darlington County Jetport Airport</name>
@@ -43840,7 +43840,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Florence</_name>
+          <name msgctxt="City in South Carolina, United States">Florence</name>
           <coordinates>34.195433 -79.762563</coordinates>
           <location>
             <name>Florence Regional Airport</name>
@@ -43852,7 +43852,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Greenville</_name>
+          <name msgctxt="City in South Carolina, United States">Greenville</name>
           <coordinates>34.852618 -82.394010</coordinates>
           <location>
             <name>Greenville Downtown Airport</name>
@@ -43864,7 +43864,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name msgctxt="City in South Carolina, United States">Greenwood</_name>
+          <name msgctxt="City in South Carolina, United States">Greenwood</name>
           <coordinates>34.195400 -82.161788</coordinates>
           <location>
             <name>Greenwood County Airport</name>
@@ -43874,7 +43874,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Greer</_name>
+          <name>Greer</name>
           <coordinates>34.938728 -82.227057</coordinates>
           <location>
             <name>Greenville-Spartanburg Airport</name>
@@ -43886,7 +43886,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Hilton Head Island</_name>
+          <name>Hilton Head Island</name>
           <coordinates>32.216316 -80.752608</coordinates>
           <location>
             <name>Hilton Head Airport</name>
@@ -43896,7 +43896,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Myrtle Beach</_name>
+          <name>Myrtle Beach</name>
           <coordinates>33.689060 -78.886694</coordinates>
           <location>
             <name>Myrtle Beach Air Force Base</name>
@@ -43908,7 +43908,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>North Myrtle Beach</_name>
+          <name>North Myrtle Beach</name>
           <coordinates>33.816006 -78.680016</coordinates>
           <location>
             <name>Grand Strand Airport</name>
@@ -43920,7 +43920,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Orangeburg</_name>
+          <name>Orangeburg</name>
           <coordinates>33.491820 -80.855648</coordinates>
           <location>
             <name>Orangeburg Municipal Airport</name>
@@ -43930,7 +43930,7 @@
         </city>
         <city>
           <!-- A city in South Carolina in the United States -->
-          <_name>Rock Hill</_name>
+          <name>Rock Hill</name>
           <coordinates>34.924867 -81.025078</coordinates>
           <location>
             <name>Rock Hill - York County Airport</name>
@@ -43941,12 +43941,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>South Dakota</_name>
+        <name>South Dakota</name>
         <fips-code>US46</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name msgctxt="City in South Dakota, United States">Aberdeen</_name>
+          <name msgctxt="City in South Dakota, United States">Aberdeen</name>
           <coordinates>45.464698 -98.486483</coordinates>
           <location>
             <name>Aberdeen Regional Airport</name>
@@ -43958,7 +43958,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Box Elder</_name>
+          <name>Box Elder</name>
           <coordinates>44.112488 -103.068232</coordinates>
           <location>
             <name>Ellsworth Air Force Base</name>
@@ -43971,7 +43971,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name msgctxt="City in South Dakota, United States">Brookings</_name>
+          <name msgctxt="City in South Dakota, United States">Brookings</name>
           <coordinates>44.311357 -96.798388</coordinates>
           <location>
             <name>Brookings Municipal Airport</name>
@@ -43983,7 +43983,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name msgctxt="City in South Dakota, United States">Buffalo</_name>
+          <name msgctxt="City in South Dakota, United States">Buffalo</name>
           <coordinates>45.584164 -103.546025</coordinates>
           <location>
             <name>Buffalo</name>
@@ -43994,7 +43994,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Chamberlain</_name>
+          <name>Chamberlain</name>
           <coordinates>43.810828 -99.330656</coordinates>
           <location>
             <name>Chamberlain Municipal Airport</name>
@@ -44006,7 +44006,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Custer</_name>
+          <name>Custer</name>
           <coordinates>43.766651 -103.598806</coordinates>
           <location>
             <name>Custer County Airport</name>
@@ -44019,7 +44019,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Faith</_name>
+          <name>Faith</name>
           <coordinates>45.023039 -102.035992</coordinates>
           <location>
             <name>Faith</name>
@@ -44030,7 +44030,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Huron</_name>
+          <name>Huron</name>
           <coordinates>44.363317 -98.214257</coordinates>
           <location>
             <name>Huron Regional Airport</name>
@@ -44042,7 +44042,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Mitchell</_name>
+          <name>Mitchell</name>
           <coordinates>43.709428 -98.029799</coordinates>
           <location>
             <name>Mitchell Municipal Airport</name>
@@ -44054,7 +44054,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Mobridge</_name>
+          <name>Mobridge</name>
           <coordinates>45.537216 -100.427913</coordinates>
           <location>
             <name>Mobridge Municipal Airport</name>
@@ -44066,7 +44066,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Philip</_name>
+          <name>Philip</name>
           <coordinates>44.039433 -101.665144</coordinates>
           <location>
             <name>Philip Airport</name>
@@ -44079,7 +44079,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Pierre</_name>
+          <name>Pierre</name>
           <coordinates>44.368316 -100.350966</coordinates>
           <location>
             <name>Pierre Regional Airport</name>
@@ -44091,7 +44091,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Pine Ridge</_name>
+          <name>Pine Ridge</name>
           <coordinates>43.025541 -102.556274</coordinates>
           <location>
             <name>Pine Ridge Airport</name>
@@ -44102,7 +44102,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Rapid City</_name>
+          <name>Rapid City</name>
           <coordinates>44.080543 -103.231015</coordinates>
           <location>
             <name>Rapid City Regional Airport</name>
@@ -44115,7 +44115,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Sioux Falls</_name>
+          <name>Sioux Falls</name>
           <coordinates>43.549975 -96.700327</coordinates>
           <location>
             <name>Foss Field</name>
@@ -44127,7 +44127,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Sisseton</_name>
+          <name>Sisseton</name>
           <coordinates>45.664682 -97.049805</coordinates>
           <location>
             <name>Sisseton Municipal Airport</name>
@@ -44137,7 +44137,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name msgctxt="City in South Dakota, United States">Watertown</_name>
+          <name msgctxt="City in South Dakota, United States">Watertown</name>
           <coordinates>44.899409 -97.115073</coordinates>
           <location>
             <name>Watertown Municipal Airport</name>
@@ -44149,7 +44149,7 @@
         </city>
         <city>
           <!-- A city in South Dakota in the United States -->
-          <_name>Yankton</_name>
+          <name>Yankton</name>
           <coordinates>42.871109 -97.397281</coordinates>
           <location>
             <name>Chan Gurney Municipal Airport</name>
@@ -44162,12 +44162,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Tennessee</_name>
+        <name>Tennessee</name>
         <fips-code>US47</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Chattanooga</_name>
+          <name>Chattanooga</name>
           <coordinates>35.045630 -85.309680</coordinates>
           <location>
             <name>Lovell Field</name>
@@ -44180,7 +44180,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name msgctxt="City in Tennessee, United States">Clarksville</_name>
+          <name msgctxt="City in Tennessee, United States">Clarksville</name>
           <coordinates>36.529771 -87.359453</coordinates>
           <location>
             <name>Outlaw Field Airport</name>
@@ -44198,7 +44198,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Crossville</_name>
+          <name>Crossville</name>
           <coordinates>35.948957 -85.026901</coordinates>
           <location>
             <name>Crossville Memorial-Whitson Field Airport</name>
@@ -44210,7 +44210,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Dyersburg</_name>
+          <name>Dyersburg</name>
           <coordinates>36.034516 -89.385628</coordinates>
           <location>
             <name>Dyersburg Municipal Airport</name>
@@ -44222,7 +44222,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name msgctxt="City in Tennessee, United States">Jackson</_name>
+          <name msgctxt="City in Tennessee, United States">Jackson</name>
           <coordinates>35.614517 -88.813947</coordinates>
           <location>
             <name>McKellar-Sipes Regional Airport</name>
@@ -44234,7 +44234,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Kingsport</_name>
+          <name>Kingsport</name>
           <coordinates>36.548434 -82.561819</coordinates>
           <location>
             <name>Bristol / Johnson / Kingsport, Tri-City Regional Airport</name>
@@ -44247,7 +44247,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name msgctxt="City in Tennessee, United States">Knoxville</_name>
+          <name msgctxt="City in Tennessee, United States">Knoxville</name>
           <coordinates>35.960638 -83.920739</coordinates>
           <location>
             <name>McGhee Tyson Airport</name>
@@ -44260,7 +44260,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Memphis</_name>
+          <name>Memphis</name>
           <coordinates>35.149534 -90.048980</coordinates>
           <location>
             <name>Memphis International Airport</name>
@@ -44272,7 +44272,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Millington</_name>
+          <name>Millington</name>
           <coordinates>35.341474 -89.897308</coordinates>
           <location>
             <name>Millington Municipal Airport</name>
@@ -44284,7 +44284,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Nashville</_name>
+          <name>Nashville</name>
           <coordinates>36.165890 -86.784443</coordinates>
           <location>
             <name>Nashville International Airport</name>
@@ -44296,7 +44296,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Oak Ridge</_name>
+          <name>Oak Ridge</name>
           <coordinates>36.010356 -84.269645</coordinates>
           <location>
             <name>Oak Ridge</name>
@@ -44307,7 +44307,7 @@
         </city>
         <city>
           <!-- A city in Tennessee in the United States -->
-          <_name>Smyrna</_name>
+          <name>Smyrna</name>
           <coordinates>35.982841 -86.518604</coordinates>
           <location>
             <name>Smyrna Airport</name>
@@ -44320,12 +44320,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Texas</_name>
+        <name>Texas</name>
         <fips-code>US48</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Abilene</_name>
+          <name>Abilene</name>
           <coordinates>32.448736 -99.733144</coordinates>
           <location>
             <name>Abilene Regional Airport</name>
@@ -44344,7 +44344,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Alice</_name>
+          <name>Alice</name>
           <coordinates>27.752249 -98.069725</coordinates>
           <location>
             <name>Alice International Airport</name>
@@ -44356,7 +44356,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Alpine</_name>
+          <name msgctxt="City in Texas, United States">Alpine</name>
           <coordinates>30.358492 -103.661012</coordinates>
           <location>
             <name>Alpine-Casparis Municipal Airport</name>
@@ -44366,7 +44366,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Amarillo</_name>
+          <name>Amarillo</name>
           <coordinates>35.221997 -101.831297</coordinates>
           <location>
             <name>Amarillo International Airport</name>
@@ -44378,7 +44378,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Angleton</_name>
+          <name>Angleton</name>
           <coordinates>29.169410 -95.431885</coordinates>
           <location>
             <name>Angleton / Lake Jackson, Brazoria County Airport</name>
@@ -44389,7 +44389,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Arlington</_name>
+          <name msgctxt="City in Texas, United States">Arlington</name>
           <coordinates>32.735687 -97.108066</coordinates>
           <location>
             <name>Arlington Municipal Airport</name>
@@ -44401,7 +44401,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Austin</_name>
+          <name msgctxt="City in Texas, United States">Austin</name>
           <coordinates>30.267153 -97.743061</coordinates>
           <location>
             <name>Austin City, Austin Camp Mabry</name>
@@ -44420,7 +44420,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Bay City</_name>
+          <name>Bay City</name>
           <coordinates>28.982757 -95.969402</coordinates>
           <location>
             <name>Bay City Municipal Airport</name>
@@ -44430,7 +44430,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Beaumont</_name>
+          <name>Beaumont</name>
           <coordinates>30.086046 -94.101846</coordinates>
           <location>
             <name>Beaumont / Port Arthur, Southeast Texas Regional Airport</name>
@@ -44442,7 +44442,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Big Spring</_name>
+          <name>Big Spring</name>
           <coordinates>32.250398 -101.478736</coordinates>
           <location>
             <name>Big Spring McMahon-Wrinkle Airport</name>
@@ -44452,7 +44452,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Borger</_name>
+          <name>Borger</name>
           <coordinates>35.667820 -101.397388</coordinates>
           <location>
             <name>Hutchinson County Airport</name>
@@ -44464,7 +44464,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Brady</_name>
+          <name>Brady</name>
           <coordinates>31.135168 -99.335055</coordinates>
           <location>
             <name>Curtis Field Airport</name>
@@ -44474,7 +44474,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Brenham</_name>
+          <name>Brenham</name>
           <coordinates>30.166883 -96.397744</coordinates>
           <location>
             <name>Brenham Municipal Airport</name>
@@ -44484,7 +44484,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Brownsville</_name>
+          <name>Brownsville</name>
           <coordinates>25.901747 -97.497484</coordinates>
           <location>
             <name>Brownsville / South Padre Island International Airport</name>
@@ -44496,7 +44496,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Brownwood</_name>
+          <name>Brownwood</name>
           <coordinates>31.709320 -98.991161</coordinates>
           <location>
             <name>Brownwood Regional Airport</name>
@@ -44506,7 +44506,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Burnet</_name>
+          <name>Burnet</name>
           <coordinates>30.758238 -98.228358</coordinates>
           <location>
             <name>Burnet Municipal Craddock Field</name>
@@ -44517,7 +44517,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Caldwell</_name>
+          <name msgctxt="City in Texas, United States">Caldwell</name>
           <coordinates>30.531315 -96.693030</coordinates>
           <location>
             <name>Caldwell Municipal Airport</name>
@@ -44527,7 +44527,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Canadian</_name>
+          <name>Canadian</name>
           <coordinates>35.912820 -100.382077</coordinates>
           <location>
             <name>Hemphill County Airport</name>
@@ -44537,7 +44537,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Carrollton</_name>
+          <name>Carrollton</name>
           <coordinates>32.953735 -96.890282</coordinates>
           <location>
             <name>Dallas, Addison Airport</name>
@@ -44549,7 +44549,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Childress</_name>
+          <name>Childress</name>
           <coordinates>34.426453 -100.204002</coordinates>
           <location>
             <name>Childress Municipal Airport</name>
@@ -44561,7 +44561,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Clarksville</_name>
+          <name msgctxt="City in Texas, United States">Clarksville</name>
           <coordinates>33.610665 -95.052722</coordinates>
           <location>
             <name>Clarksville / Red River County-J D Trissell Field Airport</name>
@@ -44571,7 +44571,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>College Station</_name>
+          <name>College Station</name>
           <coordinates>30.627977 -96.334407</coordinates>
           <location>
             <name>Easterwood Field</name>
@@ -44583,7 +44583,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Conroe</_name>
+          <name>Conroe</name>
           <coordinates>30.311877 -95.456051</coordinates>
           <location>
             <name>Montgomery County Airport</name>
@@ -44594,7 +44594,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Corpus Christi</_name>
+          <name>Corpus Christi</name>
           <coordinates>27.800583 -97.396381</coordinates>
           <location>
             <name>Corpus Christi International Airport</name>
@@ -44613,7 +44613,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Corsicana</_name>
+          <name>Corsicana</name>
           <coordinates>32.095430 -96.468873</coordinates>
           <location>
             <name>Campbell Field-Corsicana Municipal Airport</name>
@@ -44625,7 +44625,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Cotulla</_name>
+          <name>Cotulla</name>
           <coordinates>28.436934 -99.235032</coordinates>
           <location>
             <name>Cotulla-La Salle County Airport</name>
@@ -44637,7 +44637,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Crockett</_name>
+          <name>Crockett</name>
           <coordinates>31.318236 -95.456614</coordinates>
           <location>
             <name>Houston County Airport</name>
@@ -44647,7 +44647,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Dalhart</_name>
+          <name>Dalhart</name>
           <coordinates>36.059477 -102.513250</coordinates>
           <location>
             <name>Dalhart Municipal Airport</name>
@@ -44659,7 +44659,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Dallas</_name>
+          <name>Dallas</name>
           <coordinates>32.783056 -96.806667</coordinates>
           <location>
             <name>Dallas Love Field</name>
@@ -44692,7 +44692,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Decatur</_name>
+          <name msgctxt="City in Texas, United States">Decatur</name>
           <coordinates>33.234283 -97.586139</coordinates>
           <location>
             <name>Decatur Municipal Airport</name>
@@ -44702,7 +44702,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Del Rio</_name>
+          <name>Del Rio</name>
           <coordinates>29.362730 -100.896761</coordinates>
           <location>
             <name>Del Rio International Airport</name>
@@ -44714,7 +44714,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Denton</_name>
+          <name>Denton</name>
           <coordinates>33.214841 -97.133068</coordinates>
           <location>
             <name>Denton Municipal Airport</name>
@@ -44725,7 +44725,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Dryden</_name>
+          <name msgctxt="City in Texas, United States">Dryden</name>
           <coordinates>30.044635 -102.114578</coordinates>
           <location>
             <name>Terrel County Airport</name>
@@ -44735,7 +44735,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Dumas</_name>
+          <name>Dumas</name>
           <coordinates>35.865595 -101.973235</coordinates>
           <location>
             <name>Moore County Airport</name>
@@ -44745,7 +44745,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Edinburg</_name>
+          <name>Edinburg</name>
           <coordinates>26.301737 -98.163343</coordinates>
           <location>
             <name>Edinburg International Airport</name>
@@ -44755,7 +44755,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>El Paso</_name>
+          <name>El Paso</name>
           <coordinates>31.758720 -106.486931</coordinates>
           <location>
             <name>El Paso International Airport</name>
@@ -44768,7 +44768,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Falfurrias</_name>
+          <name>Falfurrias</name>
           <coordinates>27.226987 -98.144171</coordinates>
           <location>
             <name>Brooks County Airport</name>
@@ -44778,7 +44778,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Fort Stockton</_name>
+          <name>Fort Stockton</name>
           <coordinates>30.894043 -102.879322</coordinates>
           <location>
             <name>Fort Stockton-Pecos County Airport</name>
@@ -44790,7 +44790,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Fort Worth</_name>
+          <name>Fort Worth</name>
           <coordinates>32.725409 -97.320850</coordinates>
           <location>
             <name>Fort Worth, Naval Air Station</name>
@@ -44823,7 +44823,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Fredericksburg</_name>
+          <name>Fredericksburg</name>
           <coordinates>30.275201 -98.871984</coordinates>
           <location>
             <name>Gillespie County Airport</name>
@@ -44833,7 +44833,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Gainesville</_name>
+          <name msgctxt="City in Texas, United States">Gainesville</name>
           <coordinates>33.625941 -97.133345</coordinates>
           <location>
             <name>Gainesville Municipal Airport</name>
@@ -44843,7 +44843,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Galveston</_name>
+          <name>Galveston</name>
           <coordinates>29.301348 -94.797696</coordinates>
           <location>
             <name>Scholes Field</name>
@@ -44855,7 +44855,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Garland</_name>
+          <name>Garland</name>
           <coordinates>32.912624 -96.638883</coordinates>
           <location>
             <name>Dallas, Addison Airport</name>
@@ -44867,7 +44867,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Gatesville</_name>
+          <name>Gatesville</name>
           <coordinates>31.435164 -97.743911</coordinates>
           <location>
             <name>City-County Airport</name>
@@ -44877,7 +44877,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Georgetown</_name>
+          <name msgctxt="City in Texas, United States">Georgetown</name>
           <coordinates>30.632694 -97.677231</coordinates>
           <location>
             <name>Georgetown Municipal Airport</name>
@@ -44889,7 +44889,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Giddings</_name>
+          <name>Giddings</name>
           <coordinates>30.182716 -96.936371</coordinates>
           <location>
             <name>Giddings-Lee County Airport</name>
@@ -44899,7 +44899,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Gilmer</_name>
+          <name>Gilmer</name>
           <coordinates>32.728747 -94.942438</coordinates>
           <location>
             <name>Fox Stephens Field - Gilmer Municipal Airport</name>
@@ -44909,7 +44909,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Graham</_name>
+          <name>Graham</name>
           <coordinates>33.107060 -98.589502</coordinates>
           <location>
             <name>Graham Municipal Airport</name>
@@ -44919,7 +44919,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Granbury</_name>
+          <name>Granbury</name>
           <coordinates>32.442083 -97.794197</coordinates>
           <location>
             <name>Granbury Municipal Airport</name>
@@ -44929,7 +44929,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Grand Prairie</_name>
+          <name>Grand Prairie</name>
           <coordinates>32.745964 -96.997785</coordinates>
           <location>
             <name>Grand Prairie Municipal Airport</name>
@@ -44939,7 +44939,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Greenville</_name>
+          <name msgctxt="City in Texas, United States">Greenville</name>
           <coordinates>33.138449 -96.110807</coordinates>
           <location>
             <name>Greenville / Majors</name>
@@ -44950,7 +44950,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Harlingen</_name>
+          <name>Harlingen</name>
           <coordinates>26.190631 -97.696103</coordinates>
           <location>
             <name>Rio Grande Valley International Airport</name>
@@ -44962,7 +44962,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Hearne</_name>
+          <name>Hearne</name>
           <coordinates>30.878524 -96.593026</coordinates>
           <location>
             <name>Hearne Municipal Airport</name>
@@ -44972,7 +44972,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Hebbronville</_name>
+          <name>Hebbronville</name>
           <coordinates>27.306706 -98.678352</coordinates>
           <location>
             <name>Jim Hogg County Airport</name>
@@ -44982,7 +44982,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Hillsboro</_name>
+          <name>Hillsboro</name>
           <coordinates>32.010989 -97.130006</coordinates>
           <location>
             <name>Hillsboro Municipal Airport</name>
@@ -44992,7 +44992,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Hondo</_name>
+          <name>Hondo</name>
           <coordinates>29.347456 -99.141425</coordinates>
           <location>
             <name>Hondo Municipal Airport</name>
@@ -45004,7 +45004,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Houston</_name>
+          <name>Houston</name>
           <coordinates>29.763284 -95.363271</coordinates>
           <location>
             <name>Houston Hobby Airport</name>
@@ -45051,7 +45051,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Huntsville</_name>
+          <name msgctxt="City in Texas, United States">Huntsville</name>
           <coordinates>30.723526 -95.550777</coordinates>
           <location>
             <name>Huntsville Municipal Airport</name>
@@ -45062,7 +45062,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Irving</_name>
+          <name>Irving</name>
           <coordinates>32.814018 -96.948894</coordinates>
           <location>
             <name>Dallas, Dallas Love Field</name>
@@ -45074,7 +45074,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Jacksonville</_name>
+          <name msgctxt="City in Texas, United States">Jacksonville</name>
           <coordinates>31.963778 -95.270504</coordinates>
           <location>
             <name>Cherokee County Airport</name>
@@ -45084,7 +45084,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Jasper</_name>
+          <name msgctxt="City in Texas, United States">Jasper</name>
           <coordinates>30.920199 -93.996576</coordinates>
           <location>
             <name>Jasper County-Bell Field Airport</name>
@@ -45094,7 +45094,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Junction</_name>
+          <name>Junction</name>
           <coordinates>30.489355 -99.772011</coordinates>
           <location>
             <name>Kimble County Airport</name>
@@ -45106,7 +45106,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Kerrville</_name>
+          <name>Kerrville</name>
           <coordinates>30.047433 -99.140319</coordinates>
           <location>
             <name>Kerrville Municipal Airport / Louis Schreiner Field</name>
@@ -45116,7 +45116,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Killeen</_name>
+          <name>Killeen</name>
           <coordinates>31.117119 -97.727796</coordinates>
           <location>
             <name>Fort Hood, Hood AAF Ft Hood</name>
@@ -45140,7 +45140,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Kingsville</_name>
+          <name>Kingsville</name>
           <coordinates>27.515869 -97.856109</coordinates>
           <location>
             <name>Kingsville, Naval Air Station</name>
@@ -45152,7 +45152,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">La Grange</_name>
+          <name msgctxt="City in Texas, United States">La Grange</name>
           <coordinates>29.905503 -96.876647</coordinates>
           <location>
             <name>Fayette Regional Air Center Airport</name>
@@ -45162,7 +45162,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Lancaster</_name>
+          <name msgctxt="City in Texas, United States">Lancaster</name>
           <coordinates>32.592080 -96.756108</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -45172,7 +45172,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Laredo</_name>
+          <name>Laredo</name>
           <coordinates>27.506407 -99.507542</coordinates>
           <location>
             <name>Laredo International Airport</name>
@@ -45184,7 +45184,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Llano</_name>
+          <name>Llano</name>
           <coordinates>30.759345 -98.675038</coordinates>
           <location>
             <name>Llano Municipal Airport</name>
@@ -45194,7 +45194,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Longview</_name>
+          <name>Longview</name>
           <coordinates>32.500704 -94.740489</coordinates>
           <location>
             <name>Gregg County Airport</name>
@@ -45206,7 +45206,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Lubbock</_name>
+          <name>Lubbock</name>
           <coordinates>33.577863 -101.855166</coordinates>
           <location>
             <name>Lubbock International Airport</name>
@@ -45218,7 +45218,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Lufkin</_name>
+          <name>Lufkin</name>
           <coordinates>31.338241 -94.729097</coordinates>
           <location>
             <name>Angelina County Airport</name>
@@ -45230,7 +45230,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Marfa</_name>
+          <name>Marfa</name>
           <coordinates>30.307938 -104.019072</coordinates>
           <location>
             <name>Marfa</name>
@@ -45240,7 +45240,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>McAllen</_name>
+          <name>McAllen</name>
           <coordinates>26.203407 -98.230012</coordinates>
           <location>
             <name>Miller International Airport</name>
@@ -45252,7 +45252,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>McKinney</_name>
+          <name>McKinney</name>
           <coordinates>33.197616 -96.615269</coordinates>
           <location>
             <name>McKinney, Collin County Regional Airport at McKinney</name>
@@ -45262,7 +45262,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Mesquite</_name>
+          <name>Mesquite</name>
           <coordinates>32.766796 -96.599159</coordinates>
           <location>
             <name>Mesquite Metro Airport</name>
@@ -45272,7 +45272,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Midland</_name>
+          <name>Midland</name>
           <coordinates>31.997346 -102.077915</coordinates>
           <location>
             <name>Midland Airpark</name>
@@ -45289,7 +45289,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Midlothian</_name>
+          <name>Midlothian</name>
           <coordinates>32.482361 -96.994449</coordinates>
           <location>
             <name>Midlothian / Waxahachie, Mid-Way Regional Airport</name>
@@ -45299,7 +45299,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Mineral Wells</_name>
+          <name>Mineral Wells</name>
           <coordinates>32.808461 -98.112822</coordinates>
           <location>
             <name>Mineral Wells Airport</name>
@@ -45311,7 +45311,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Mount Pleasant</_name>
+          <name msgctxt="City in Texas, United States">Mount Pleasant</name>
           <coordinates>33.156786 -94.968269</coordinates>
           <location>
             <name>Mount Pleasant Regional Airport</name>
@@ -45321,7 +45321,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Nacogdoches</_name>
+          <name>Nacogdoches</name>
           <coordinates>31.603513 -94.655487</coordinates>
           <location>
             <name>A L Mangham Jr. Regional Airport</name>
@@ -45333,7 +45333,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>New Braunfels</_name>
+          <name>New Braunfels</name>
           <coordinates>29.703002 -98.124453</coordinates>
           <location>
             <name>New Braunfels Municipal Airport</name>
@@ -45343,7 +45343,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Odessa</_name>
+          <name>Odessa</name>
           <coordinates>31.845682 -102.367643</coordinates>
           <location>
             <name>Odessa-Schlemeyer Field</name>
@@ -45353,7 +45353,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Orange</_name>
+          <name msgctxt="City in Texas, United States">Orange</name>
           <coordinates>30.092988 -93.736555</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -45363,7 +45363,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Palacios</_name>
+          <name>Palacios</name>
           <coordinates>28.708046 -96.217467</coordinates>
           <location>
             <name>Palacios Municipal Airport</name>
@@ -45375,7 +45375,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Palestine</_name>
+          <name>Palestine</name>
           <coordinates>31.762115 -95.630789</coordinates>
           <location>
             <name>Palestine Municipal Airport</name>
@@ -45385,7 +45385,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Pampa</_name>
+          <name>Pampa</name>
           <coordinates>35.536156 -100.959871</coordinates>
           <location>
             <name>Perry Lefors Field Airport</name>
@@ -45395,7 +45395,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Paris</_name>
+          <name msgctxt="City in Texas, United States">Paris</name>
           <coordinates>33.660939 -95.555513</coordinates>
           <location>
             <name>Paris / Cox Field</name>
@@ -45407,7 +45407,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Pasadena</_name>
+          <name msgctxt="City in Texas, United States">Pasadena</name>
           <coordinates>29.691063 -95.209101</coordinates>
           <location>
             <name>Houston, Houston Hobby Airport</name>
@@ -45419,7 +45419,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Pecos</_name>
+          <name>Pecos</name>
           <coordinates>31.422912 -103.493229</coordinates>
           <location>
             <name>Pecos Municipal Airport</name>
@@ -45429,7 +45429,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Perryton</_name>
+          <name>Perryton</name>
           <coordinates>36.400031 -100.802650</coordinates>
           <location>
             <name>Perryton Ochiltree County Airport</name>
@@ -45439,7 +45439,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Pine Springs</_name>
+          <name>Pine Springs</name>
           <coordinates>31.892616 -104.815503</coordinates>
           <location>
             <name>Pine Springs, Guadalupe Mountains National Park</name>
@@ -45451,7 +45451,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Plainview</_name>
+          <name>Plainview</name>
           <coordinates>34.184794 -101.706842</coordinates>
           <location>
             <name>Hale County Airport</name>
@@ -45461,7 +45461,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Plano</_name>
+          <name>Plano</name>
           <coordinates>33.019843 -96.698886</coordinates>
           <location>
             <name>Dallas, Addison Airport</name>
@@ -45473,7 +45473,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Port Aransas</_name>
+          <name>Port Aransas</name>
           <coordinates>27.833916 -97.061099</coordinates>
           <location>
             <name>Mustang Beach Airport</name>
@@ -45483,7 +45483,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Port Isabel</_name>
+          <name>Port Isabel</name>
           <coordinates>26.073412 -97.208584</coordinates>
           <location>
             <name>Port Isabel-Cameron County Airport</name>
@@ -45493,7 +45493,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Port Lavaca</_name>
+          <name>Port Lavaca</name>
           <coordinates>28.614997 -96.626089</coordinates>
           <location>
             <name>Calhoun County Airport</name>
@@ -45503,7 +45503,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Rockport</_name>
+          <name>Rockport</name>
           <coordinates>28.020573 -97.054434</coordinates>
           <location>
             <name>Aransas County Airport</name>
@@ -45515,7 +45515,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Rocksprings</_name>
+          <name>Rocksprings</name>
           <coordinates>30.015765 -100.205358</coordinates>
           <location>
             <name>Edwards County Airport</name>
@@ -45525,7 +45525,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>San Angelo</_name>
+          <name>San Angelo</name>
           <coordinates>31.463772 -100.437038</coordinates>
           <location>
             <name>Mathis Field</name>
@@ -45537,7 +45537,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>San Antonio</_name>
+          <name>San Antonio</name>
           <coordinates>29.424122 -98.493628</coordinates>
           <location>
             <name>Stinson Municipal Airport</name>
@@ -45563,7 +45563,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>San Marcos</_name>
+          <name>San Marcos</name>
           <coordinates>29.883275 -97.941394</coordinates>
           <location>
             <name>San Marcos Municipal Airport</name>
@@ -45573,7 +45573,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Seminole</_name>
+          <name msgctxt="City in Texas, United States">Seminole</name>
           <coordinates>32.718993 -102.644910</coordinates>
           <location>
             <name>Gaines County Airport</name>
@@ -45583,7 +45583,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Sherman</_name>
+          <name>Sherman</name>
           <coordinates>33.635662 -96.608880</coordinates>
           <location>
             <name>Sherman / Denison, Grayson County Airport</name>
@@ -45593,7 +45593,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Snyder</_name>
+          <name>Snyder</name>
           <coordinates>32.717886 -100.917618</coordinates>
           <location>
             <name>Winston Field Airport</name>
@@ -45603,7 +45603,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Sonora</_name>
+          <name msgctxt="City in Texas, United States">Sonora</name>
           <coordinates>30.566848 -100.643427</coordinates>
           <location>
             <name>Sonora Municipal Airport</name>
@@ -45613,7 +45613,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Spofford</_name>
+          <name>Spofford</name>
           <coordinates>29.175239 -100.413688</coordinates>
           <location>
             <name>Laughlin, Laughlin Air Force Base Auxiliary Airfield</name>
@@ -45624,7 +45624,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Stephenville</_name>
+          <name msgctxt="City in Texas, United States">Stephenville</name>
           <coordinates>32.220696 -98.202263</coordinates>
           <location>
             <name>Clark Field Municipal Airport</name>
@@ -45634,7 +45634,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Sulphur Springs</_name>
+          <name>Sulphur Springs</name>
           <coordinates>33.138448 -95.601067</coordinates>
           <location>
             <name>Sulphur Springs Municipal Airport</name>
@@ -45644,7 +45644,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Sweetwater</_name>
+          <name>Sweetwater</name>
           <coordinates>32.470952 -100.405938</coordinates>
           <location>
             <name>Avenger Field Airport</name>
@@ -45654,7 +45654,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Temple</_name>
+          <name>Temple</name>
           <coordinates>31.098234 -97.342782</coordinates>
           <location>
             <name>Draughon-Miller Central Texas Regional Airport</name>
@@ -45666,7 +45666,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Terrell</_name>
+          <name>Terrell</name>
           <coordinates>32.735963 -96.275257</coordinates>
           <location>
             <name>Terrell Municipal Airport</name>
@@ -45677,7 +45677,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Tyler</_name>
+          <name>Tyler</name>
           <coordinates>32.351260 -95.301062</coordinates>
           <location>
             <name>Tyler Pounds Field</name>
@@ -45689,7 +45689,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Universal City</_name>
+          <name>Universal City</name>
           <coordinates>29.548007 -98.291123</coordinates>
           <location>
             <name>Randolph Air Force Base</name>
@@ -45700,7 +45700,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Uvalde</_name>
+          <name>Uvalde</name>
           <coordinates>29.209684 -99.786168</coordinates>
           <location>
             <name>Garner Field Airport</name>
@@ -45710,7 +45710,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Vernon</_name>
+          <name msgctxt="City in Texas, United States">Vernon</name>
           <coordinates>34.154531 -99.265080</coordinates>
           <location>
             <name>Wilbarger County Airport</name>
@@ -45720,7 +45720,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name msgctxt="City in Texas, United States">Victoria</_name>
+          <name msgctxt="City in Texas, United States">Victoria</name>
           <coordinates>28.805267 -97.003598</coordinates>
           <location>
             <name>Victoria Regional Airport</name>
@@ -45732,7 +45732,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Waco</_name>
+          <name>Waco</name>
           <coordinates>31.549333 -97.146670</coordinates>
           <location>
             <name>Waco Regional Airport</name>
@@ -45750,7 +45750,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Weslaco</_name>
+          <name>Weslaco</name>
           <coordinates>26.159519 -97.990837</coordinates>
           <location>
             <name>Mid Valley Airport</name>
@@ -45760,7 +45760,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Wharton</_name>
+          <name>Wharton</name>
           <coordinates>29.311637 -96.102737</coordinates>
           <location>
             <name>Wharton Regional Airport</name>
@@ -45770,7 +45770,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Wichita Falls</_name>
+          <name>Wichita Falls</name>
           <coordinates>33.913708 -98.493387</coordinates>
           <location>
             <name>Sheppard Air Force Base</name>
@@ -45782,7 +45782,7 @@
         </city>
         <city>
           <!-- A city in Texas in the United States -->
-          <_name>Wink</_name>
+          <name>Wink</name>
           <coordinates>31.751240 -103.159888</coordinates>
           <location>
             <name>Winkler County Airport</name>
@@ -45795,12 +45795,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Utah</_name>
+        <name>Utah</name>
         <fips-code>US49</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Bryce Canyon</_name>
+          <name>Bryce Canyon</name>
           <coordinates>37.628316 -112.167695</coordinates>
           <location>
             <name>Bryce Canyon Airport</name>
@@ -45812,7 +45812,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Cedar City</_name>
+          <name>Cedar City</name>
           <coordinates>37.677477 -113.061893</coordinates>
           <location>
             <name>Cedar City Municipal Airport</name>
@@ -45824,7 +45824,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Delta</_name>
+          <name>Delta</name>
           <coordinates>39.352178 -112.577170</coordinates>
           <location>
             <name>Delta</name>
@@ -45836,7 +45836,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Hanksville</_name>
+          <name>Hanksville</name>
           <coordinates>38.373038 -110.714039</coordinates>
           <location>
             <name>Hanksville</name>
@@ -45848,7 +45848,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Lakeside</_name>
+          <name>Lakeside</name>
           <coordinates>41.222430 -112.865534</coordinates>
           <location>
             <name>Eagle Range</name>
@@ -45858,7 +45858,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Logan</_name>
+          <name>Logan</name>
           <coordinates>41.735486 -111.834388</coordinates>
           <location>
             <name>Logan-Cache Airport</name>
@@ -45870,7 +45870,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Milford</_name>
+          <name>Milford</name>
           <coordinates>38.396911 -113.010789</coordinates>
           <location>
             <name>Milford Municipal Airport</name>
@@ -45882,7 +45882,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Moab</_name>
+          <name>Moab</name>
           <coordinates>38.573315 -109.549840</coordinates>
           <location>
             <name>Canyonlands Field</name>
@@ -45892,7 +45892,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Ogden</_name>
+          <name>Ogden</name>
           <coordinates>41.223000 -111.973830</coordinates>
           <location>
             <name>Ogden-Hinckley Airport</name>
@@ -45911,7 +45911,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Price</_name>
+          <name>Price</name>
           <coordinates>39.599410 -110.810715</coordinates>
           <location>
             <name>Carbon County Airport</name>
@@ -45923,7 +45923,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Provo</_name>
+          <name>Provo</name>
           <coordinates>40.233844 -111.658534</coordinates>
           <location>
             <name>Provo Municipal Airport</name>
@@ -45935,7 +45935,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Salt Lake City</_name>
+          <name>Salt Lake City</name>
           <coordinates>40.760779 -111.891047</coordinates>
           <location>
             <name>Salt Lake City International Airport</name>
@@ -45947,7 +45947,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name msgctxt="City in Utah, United States">Santa Clara</_name>
+          <name msgctxt="City in Utah, United States">Santa Clara</name>
           <coordinates>37.133035 -113.654127</coordinates>
           <location>
             <name>St George, St George Municipal Airport</name>
@@ -45959,7 +45959,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Vernal</_name>
+          <name>Vernal</name>
           <coordinates>40.455516 -109.528748</coordinates>
           <location>
             <name>Vernal Airport</name>
@@ -45971,7 +45971,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>Wendover</_name>
+          <name>Wendover</name>
           <coordinates>40.737152 -114.037510</coordinates>
           <location>
             <name>Wendover / Air Force Auxillary Field</name>
@@ -45983,7 +45983,7 @@
         </city>
         <city>
           <!-- A city in Utah in the United States -->
-          <_name>West Valley City</_name>
+          <name>West Valley City</name>
           <coordinates>40.691613 -112.001050</coordinates>
           <location>
             <name>Salt Lake City, Salt Lake City International Airport</name>
@@ -45996,12 +45996,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Vermont</_name>
+        <name>Vermont</name>
         <fips-code>US50</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name>Barre</_name>
+          <name>Barre</name>
           <coordinates>44.197006 -72.502049</coordinates>
           <location>
             <name>Barre / Montpelier, Knapp State Airport</name>
@@ -46013,7 +46013,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name>Bennington</_name>
+          <name>Bennington</name>
           <coordinates>42.878135 -73.196774</coordinates>
           <location>
             <name>Bennington Morse State Airport</name>
@@ -46023,7 +46023,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name msgctxt="City in Vermont, United States">Burlington</_name>
+          <name msgctxt="City in Vermont, United States">Burlington</name>
           <coordinates>44.475882 -73.212072</coordinates>
           <location>
             <name>Burlington International Airport</name>
@@ -46035,7 +46035,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name>Morrisville</_name>
+          <name>Morrisville</name>
           <coordinates>44.561719 -72.598449</coordinates>
           <location>
             <name>Morrisville-Stowe State Airport</name>
@@ -46045,7 +46045,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name>Rutland</_name>
+          <name>Rutland</name>
           <coordinates>43.610624 -72.972606</coordinates>
           <location>
             <name>Rutland State Airport</name>
@@ -46057,7 +46057,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name>Saint Johnsbury</_name>
+          <name>Saint Johnsbury</name>
           <coordinates>44.419225 -72.015095</coordinates>
           <location>
             <name>Saint Johnsbury</name>
@@ -46069,7 +46069,7 @@
         </city>
         <city>
           <!-- A city in Vermont in the United States -->
-          <_name msgctxt="City in Vermont, United States">Springfield</_name>
+          <name msgctxt="City in Vermont, United States">Springfield</name>
           <coordinates>43.298408 -72.482312</coordinates>
           <location>
             <name>Hartness State Springfield Airport</name>
@@ -46082,12 +46082,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Virginia</_name>
+        <name>Virginia</name>
         <fips-code>US51</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Abingdon</_name>
+          <name>Abingdon</name>
           <coordinates>36.709834 -81.977348</coordinates>
           <location>
             <name>Abingdon</name>
@@ -46099,7 +46099,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Alexandria</_name>
+          <name msgctxt="City in Virginia, United States">Alexandria</name>
           <coordinates>38.804836 -77.046921</coordinates>
           <location>
             <name>Washington DC, Reagan National Airport</name>
@@ -46111,7 +46111,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Ashland</_name>
+          <name msgctxt="City in Virginia, United States">Ashland</name>
           <coordinates>37.759032 -77.479984</coordinates>
           <location>
             <name>Hanover County Municipal Airport</name>
@@ -46123,7 +46123,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Blacksburg</_name>
+          <name>Blacksburg</name>
           <coordinates>37.229573 -80.413939</coordinates>
           <location>
             <name>Virginia Tech Airport</name>
@@ -46135,7 +46135,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Charlottesville</_name>
+          <name>Charlottesville</name>
           <coordinates>38.029306 -78.476678</coordinates>
           <location>
             <name>Charlottesville-Albemarle Airport</name>
@@ -46147,7 +46147,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Chesapeake</_name>
+          <name>Chesapeake</name>
           <coordinates>36.819037 -76.274940</coordinates>
           <location>
             <name>Chesapeake Municipal Airport</name>
@@ -46157,7 +46157,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Chincoteague</_name>
+          <name>Chincoteague</name>
           <coordinates>37.933179 -75.378809</coordinates>
           <location>
             <name>Wallops Island, Wallops Flight Facility Airport</name>
@@ -46168,7 +46168,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Culpeper</_name>
+          <name>Culpeper</name>
           <coordinates>38.473182 -77.996664</coordinates>
           <location>
             <name>Culpeper County Airport</name>
@@ -46178,7 +46178,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Danville</_name>
+          <name msgctxt="City in Virginia, United States">Danville</name>
           <coordinates>36.585972 -79.395023</coordinates>
           <location>
             <name>Danville Regional Airport</name>
@@ -46190,7 +46190,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Dublin</_name>
+          <name msgctxt="City in Virginia, United States">Dublin</name>
           <coordinates>37.105678 -80.685343</coordinates>
           <location>
             <name>Dublin / New River Valley</name>
@@ -46202,7 +46202,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Emporia</_name>
+          <name msgctxt="City in Virginia, United States">Emporia</name>
           <coordinates>36.685983 -77.542481</coordinates>
           <location>
             <name>Emporia-Greensville Regional Airport</name>
@@ -46212,7 +46212,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Farmville</_name>
+          <name>Farmville</name>
           <coordinates>37.302096 -78.391940</coordinates>
           <location>
             <name>Farmville</name>
@@ -46224,7 +46224,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Franklin</_name>
+          <name msgctxt="City in Virginia, United States">Franklin</name>
           <coordinates>36.677651 -76.922461</coordinates>
           <location>
             <name>Franklin / J B Rose</name>
@@ -46236,7 +46236,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Hampton</_name>
+          <name>Hampton</name>
           <coordinates>37.029869 -76.345222</coordinates>
           <location>
             <name>Langley Air Force Base</name>
@@ -46248,7 +46248,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Hillsville</_name>
+          <name>Hillsville</name>
           <coordinates>36.762628 -80.734795</coordinates>
           <location>
             <name>Hillsville</name>
@@ -46260,7 +46260,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Hot Springs</_name>
+          <name msgctxt="City in Virginia, United States">Hot Springs</name>
           <coordinates>37.999570 -79.831719</coordinates>
           <location>
             <name>Hot Springs / Ingalls</name>
@@ -46272,7 +46272,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Leesburg</_name>
+          <name msgctxt="City in Virginia, United States">Leesburg</name>
           <coordinates>39.115662 -77.563602</coordinates>
           <location>
             <name>Leesburg / Godfrey</name>
@@ -46284,7 +46284,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Louisa</_name>
+          <name>Louisa</name>
           <coordinates>38.025139 -78.004165</coordinates>
           <location>
             <name>Louisa County Airport / Freeman Field</name>
@@ -46294,7 +46294,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Lynchburg</_name>
+          <name>Lynchburg</name>
           <coordinates>37.413754 -79.142246</coordinates>
           <location>
             <name>Lynchburg Regional Airport</name>
@@ -46306,7 +46306,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Manassas</_name>
+          <name>Manassas</name>
           <coordinates>38.750949 -77.475267</coordinates>
           <location>
             <name>Manassas Regional Airport / Harry P. Davis Field</name>
@@ -46318,7 +46318,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Marion</_name>
+          <name msgctxt="City in Virginia, United States">Marion</name>
           <coordinates>36.834838 -81.514837</coordinates>
           <location>
             <name>Marion / Wytheville</name>
@@ -46330,7 +46330,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Martinsville</_name>
+          <name>Martinsville</name>
           <coordinates>36.691526 -79.872539</coordinates>
           <location>
             <name>Martinsville</name>
@@ -46342,7 +46342,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Melfa</_name>
+          <name>Melfa</name>
           <coordinates>37.649299 -75.741318</coordinates>
           <location>
             <name>Accomack Airport</name>
@@ -46354,7 +46354,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Newport News</_name>
+          <name>Newport News</name>
           <coordinates>36.978759 -76.428003</coordinates>
           <location>
             <name>Newport News / Williamsburg International Airport</name>
@@ -46372,7 +46372,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Norfolk</_name>
+          <name msgctxt="City in Virginia, United States">Norfolk</name>
           <coordinates>36.846815 -76.285218</coordinates>
           <location>
             <name>Norfolk, Naval Air Station</name>
@@ -46391,7 +46391,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Orange</_name>
+          <name msgctxt="City in Virginia, United States">Orange</name>
           <coordinates>38.245411 -78.110834</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -46401,7 +46401,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Petersburg</_name>
+          <name msgctxt="City in Virginia, United States">Petersburg</name>
           <coordinates>37.227928 -77.401927</coordinates>
           <location>
             <name>Dinwiddie County Airport</name>
@@ -46413,7 +46413,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Pohick</_name>
+          <name>Pohick</name>
           <coordinates>38.710115 -77.196648</coordinates>
           <location>
             <name>Fort Belvoir</name>
@@ -46425,7 +46425,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Portsmouth</_name>
+          <name msgctxt="City in Virginia, United States">Portsmouth</name>
           <coordinates>36.835426 -76.298274</coordinates>
           <location>
             <name>Norfolk, Naval Air Station</name>
@@ -46437,7 +46437,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Quantico</_name>
+          <name>Quantico</name>
           <coordinates>38.522343 -77.293593</coordinates>
           <location>
             <name>Quantico, Marine Corps Air Facility</name>
@@ -46449,7 +46449,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name msgctxt="City in Virginia, United States">Richmond</_name>
+          <name msgctxt="City in Virginia, United States">Richmond</name>
           <coordinates>37.553758 -77.460262</coordinates>
           <location>
             <name>Richmond International Airport</name>
@@ -46461,7 +46461,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Roanoke</_name>
+          <name>Roanoke</name>
           <coordinates>37.270970 -79.941427</coordinates>
           <location>
             <name>Roanoke Regional Airport</name>
@@ -46473,7 +46473,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>South Hill</_name>
+          <name>South Hill</name>
           <coordinates>36.726532 -78.128886</coordinates>
           <location>
             <name>Mecklenburg-Brunswick Regional Airport</name>
@@ -46483,7 +46483,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Stafford</_name>
+          <name>Stafford</name>
           <coordinates>38.422069 -77.408316</coordinates>
           <location>
             <name>Stafford Regional Airport</name>
@@ -46493,7 +46493,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Staunton</_name>
+          <name>Staunton</name>
           <coordinates>38.149576 -79.071696</coordinates>
           <location>
             <name>Staunton / Shenandoah</name>
@@ -46505,7 +46505,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Suffolk</_name>
+          <name>Suffolk</name>
           <coordinates>36.728205 -76.583562</coordinates>
           <location>
             <name>Suffolk Municipal Airport</name>
@@ -46515,7 +46515,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Virginia Beach</_name>
+          <name>Virginia Beach</name>
           <coordinates>36.852926 -75.977985</coordinates>
           <location>
             <name>Virginia Beach, Oceana, Naval Air Station</name>
@@ -46527,7 +46527,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Wakefield</_name>
+          <name>Wakefield</name>
           <coordinates>36.968206 -76.989683</coordinates>
           <location>
             <name>Wakefield Municipal Airport</name>
@@ -46539,7 +46539,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>West Point</_name>
+          <name>West Point</name>
           <coordinates>37.531534 -76.796350</coordinates>
           <location>
             <name>Middle Peninsula Regional Airport</name>
@@ -46549,7 +46549,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Williamsburg</_name>
+          <name>Williamsburg</name>
           <coordinates>37.270702 -76.707457</coordinates>
           <location>
             <name>Williamsburg-Jamestown Airport</name>
@@ -46559,7 +46559,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Winchester</_name>
+          <name>Winchester</name>
           <coordinates>39.185660 -78.163334</coordinates>
           <location>
             <name>Winchester Regional</name>
@@ -46571,7 +46571,7 @@
         </city>
         <city>
           <!-- A city in Virginia in the United States -->
-          <_name>Wise</_name>
+          <name>Wise</name>
           <coordinates>36.975935 -82.575711</coordinates>
           <location>
             <name>Wise / Lonesome Pine</name>
@@ -46584,12 +46584,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name msgctxt="State in United States">Washington</_name>
+        <name msgctxt="State in United States">Washington</name>
         <fips-code>US53</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name msgctxt="City in Washington, United States">Arlington</_name>
+          <name msgctxt="City in Washington, United States">Arlington</name>
           <coordinates>48.198712 -122.125142</coordinates>
           <location>
             <name>Arlington Municipal</name>
@@ -46599,7 +46599,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Bellevue</_name>
+          <name>Bellevue</name>
           <coordinates>47.610377 -122.200679</coordinates>
           <location>
             <name>Seattle, Seattle Boeing Field</name>
@@ -46611,7 +46611,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Bellingham</_name>
+          <name>Bellingham</name>
           <coordinates>48.759553 -122.488225</coordinates>
           <location>
             <name>Bellingham International Airport</name>
@@ -46623,7 +46623,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Bremerton</_name>
+          <name>Bremerton</name>
           <coordinates>47.567318 -122.632639</coordinates>
           <location>
             <name>Bremerton National Airport</name>
@@ -46635,7 +46635,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name msgctxt="City in Washington, United States">Burlington</_name>
+          <name msgctxt="City in Washington, United States">Burlington</name>
           <coordinates>48.475662 -122.325438</coordinates>
           <location>
             <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
@@ -46647,7 +46647,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Deer Park</_name>
+          <name>Deer Park</name>
           <coordinates>47.954338 -117.476891</coordinates>
           <location>
             <name>Deer Park Airport</name>
@@ -46657,7 +46657,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Eastsound</_name>
+          <name>Eastsound</name>
           <coordinates>48.696771 -122.905462</coordinates>
           <location>
             <name>Orcas Island Airport</name>
@@ -46667,7 +46667,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Ellensburg</_name>
+          <name>Ellensburg</name>
           <coordinates>46.996514 -120.547847</coordinates>
           <location>
             <name>Ellensburg Bowers Field</name>
@@ -46677,7 +46677,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Ephrata</_name>
+          <name>Ephrata</name>
           <coordinates>47.317639 -119.553649</coordinates>
           <location>
             <name>Ephrata Municipal Airport</name>
@@ -46689,7 +46689,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Everett</_name>
+          <name>Everett</name>
           <coordinates>47.978985 -122.202079</coordinates>
           <location>
             <name>Snohomish County Airport</name>
@@ -46701,7 +46701,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Fairchild</_name>
+          <name>Fairchild</name>
           <coordinates>47.634054 -117.668552</coordinates>
           <location>
             <name>Fairchild Air Force Base</name>
@@ -46712,7 +46712,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Friday Harbor</_name>
+          <name>Friday Harbor</name>
           <coordinates>48.534266 -123.017124</coordinates>
           <location>
             <name>Friday Harbor Airport</name>
@@ -46724,7 +46724,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name msgctxt="City in Washington, United States">Hanford</_name>
+          <name msgctxt="City in Washington, United States">Hanford</name>
           <coordinates>46.583748 -119.387799</coordinates>
           <location>
             <name>Hanford</name>
@@ -46734,7 +46734,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Hoquiam</_name>
+          <name>Hoquiam</name>
           <coordinates>46.980925 -123.889335</coordinates>
           <location>
             <name>Bowerman Airport</name>
@@ -46744,7 +46744,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Kelso</_name>
+          <name>Kelso</name>
           <coordinates>46.146779 -122.908445</coordinates>
           <location>
             <name>Kelso-Longview Airport</name>
@@ -46754,7 +46754,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Moses Lake</_name>
+          <name>Moses Lake</name>
           <coordinates>47.130142 -119.278077</coordinates>
           <location>
             <name>Grant County Airport</name>
@@ -46766,7 +46766,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Oak Harbor</_name>
+          <name>Oak Harbor</name>
           <coordinates>48.293156 -122.643225</coordinates>
           <location>
             <name>Whidbey Island, Naval Air Station</name>
@@ -46778,7 +46778,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Olympia</_name>
+          <name>Olympia</name>
           <coordinates>47.037874 -122.900695</coordinates>
           <location>
             <name>Olympia Airport</name>
@@ -46790,7 +46790,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Omak</_name>
+          <name>Omak</name>
           <coordinates>48.410985 -119.527551</coordinates>
           <location>
             <name>Omak Airport</name>
@@ -46800,7 +46800,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Pasco</_name>
+          <name>Pasco</name>
           <coordinates>46.239579 -119.100566</coordinates>
           <location>
             <name>Tri-Cities Airport</name>
@@ -46812,7 +46812,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Port Angeles</_name>
+          <name>Port Angeles</name>
           <coordinates>48.118146 -123.430741</coordinates>
           <location>
             <name>William R. Fairchild International Airport</name>
@@ -46824,7 +46824,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Quillayute</_name>
+          <name>Quillayute</name>
           <coordinates>47.943130 -124.542435</coordinates>
           <location>
             <name>Quillayute State Airport</name>
@@ -46835,7 +46835,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Renton</_name>
+          <name>Renton</name>
           <coordinates>47.482878 -122.217066</coordinates>
           <location>
             <name>Renton Municipal Airport</name>
@@ -46847,7 +46847,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Seattle</_name>
+          <name>Seattle</name>
           <coordinates>47.606209 -122.332071</coordinates>
           <location>
             <name>Seattle Boeing Field</name>
@@ -46866,7 +46866,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Shelton</_name>
+          <name>Shelton</name>
           <coordinates>47.215094 -123.100707</coordinates>
           <location>
             <name>Shelton Sanderson Field</name>
@@ -46878,7 +46878,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Spokane</_name>
+          <name>Spokane</name>
           <coordinates>47.658780 -117.426047</coordinates>
           <location>
             <name>Felts Field</name>
@@ -46897,7 +46897,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Stampede</_name>
+          <name>Stampede</name>
           <coordinates>47.262890 -121.366482</coordinates>
           <location>
             <name>Stampede Pass</name>
@@ -46907,7 +46907,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Tacoma</_name>
+          <name>Tacoma</name>
           <coordinates>47.252877 -122.444291</coordinates>
           <location>
             <name>Tacoma Narrows Airport</name>
@@ -46926,7 +46926,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Tillicum</_name>
+          <name>Tillicum</name>
           <coordinates>47.123431 -122.557070</coordinates>
           <location>
             <name>Fort Lewis / Gray U. S. Army Airfield</name>
@@ -46938,7 +46938,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name msgctxt="City in Washington, United States">Vancouver</_name>
+          <name msgctxt="City in Washington, United States">Vancouver</name>
           <coordinates>45.638728 -122.661486</coordinates>
           <location>
             <name>Pearson Field Airport</name>
@@ -46950,7 +46950,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Walla Walla</_name>
+          <name>Walla Walla</name>
           <coordinates>46.064581 -118.343021</coordinates>
           <location>
             <name>Walla Walla Regional Airport</name>
@@ -46962,7 +46962,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Wenatchee</_name>
+          <name>Wenatchee</name>
           <coordinates>47.423460 -120.310349</coordinates>
           <location>
             <name>Pangborn Memorial Airport</name>
@@ -46974,7 +46974,7 @@
         </city>
         <city>
           <!-- A city in Washington in the United States -->
-          <_name>Yakima</_name>
+          <name>Yakima</name>
           <coordinates>46.602071 -120.505899</coordinates>
           <location>
             <name>Yakima Air Terminal</name>
@@ -46987,12 +46987,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>West Virginia</_name>
+        <name>West Virginia</name>
         <fips-code>US54</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Beckley</_name>
+          <name>Beckley</name>
           <coordinates>37.778170 -81.188156</coordinates>
           <location>
             <name>Raleigh County Memorial Airport</name>
@@ -47004,7 +47004,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Bluefield</_name>
+          <name>Bluefield</name>
           <coordinates>37.269840 -81.222319</coordinates>
           <location>
             <name>Mercer County Airport</name>
@@ -47016,7 +47016,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Buckhannon</_name>
+          <name>Buckhannon</name>
           <coordinates>38.993987 -80.232028</coordinates>
           <location>
             <name>Upshur County Regional Airport</name>
@@ -47026,7 +47026,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name msgctxt="City in West Virginia, United States">Charleston</_name>
+          <name msgctxt="City in West Virginia, United States">Charleston</name>
           <coordinates>38.349820 -81.632623</coordinates>
           <location>
             <name>Yeager Airport</name>
@@ -47038,7 +47038,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Clarksburg</_name>
+          <name>Clarksburg</name>
           <coordinates>39.280645 -80.344534</coordinates>
           <location>
             <name>Clarksburg Benedum Airport</name>
@@ -47050,7 +47050,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Elkins</_name>
+          <name>Elkins</name>
           <coordinates>38.925940 -79.846735</coordinates>
           <location>
             <name>Elkins-Randolph County-Jennings Randolph Field</name>
@@ -47062,7 +47062,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Huntington</_name>
+          <name>Huntington</name>
           <coordinates>38.419250 -82.445154</coordinates>
           <location>
             <name>Tri-State Airport</name>
@@ -47074,7 +47074,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Lewisburg</_name>
+          <name>Lewisburg</name>
           <coordinates>37.801788 -80.445630</coordinates>
           <location>
             <name>Lewisburg / Greenbrier</name>
@@ -47086,7 +47086,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Martinsburg</_name>
+          <name>Martinsburg</name>
           <coordinates>39.456210 -77.963887</coordinates>
           <location>
             <name>Eastern West Virginia Regional / Shepherd Airport</name>
@@ -47098,7 +47098,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Morgantown</_name>
+          <name>Morgantown</name>
           <coordinates>39.629526 -79.955897</coordinates>
           <location>
             <name>Morgantown Municipal-Hart Field</name>
@@ -47110,7 +47110,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Parkersburg</_name>
+          <name>Parkersburg</name>
           <coordinates>39.266742 -81.561514</coordinates>
           <location>
             <name>Mid-Ohio Valley Regional Airport</name>
@@ -47122,7 +47122,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name msgctxt="City in West Virginia, United States">Petersburg</_name>
+          <name msgctxt="City in West Virginia, United States">Petersburg</name>
           <coordinates>38.992610 -79.123924</coordinates>
           <location>
             <name>Grant County Airport</name>
@@ -47132,7 +47132,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Point Pleasant</_name>
+          <name>Point Pleasant</name>
           <coordinates>38.844525 -82.137089</coordinates>
           <location>
             <name>Mason County Airport</name>
@@ -47142,7 +47142,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name msgctxt="City in West Virginia, United States">Sutton</_name>
+          <name msgctxt="City in West Virginia, United States">Sutton</name>
           <coordinates>38.664544 -80.709819</coordinates>
           <location>
             <name>Braxton County Airport</name>
@@ -47152,7 +47152,7 @@
         </city>
         <city>
           <!-- A city in West Virginia in the United States -->
-          <_name>Wheeling</_name>
+          <name>Wheeling</name>
           <coordinates>40.063962 -80.720915</coordinates>
           <location>
             <name>Wheeling Ohio County Airport</name>
@@ -47165,12 +47165,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name>Wisconsin</_name>
+        <name>Wisconsin</name>
         <fips-code>US55</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Antigo</_name>
+          <name>Antigo</name>
           <coordinates>45.140245 -89.152335</coordinates>
           <location>
             <name>Langlade County Airport</name>
@@ -47182,7 +47182,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Appleton</_name>
+          <name msgctxt="City in Wisconsin, United States">Appleton</name>
           <coordinates>44.261931 -88.415385</coordinates>
           <location>
             <name>Appleton / Outagamie</name>
@@ -47194,7 +47194,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Ashland</_name>
+          <name msgctxt="City in Wisconsin, United States">Ashland</name>
           <coordinates>46.592443 -90.883798</coordinates>
           <location>
             <name>Kennedy Memorial Airport</name>
@@ -47205,7 +47205,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Baraboo</_name>
+          <name>Baraboo</name>
           <coordinates>43.471094 -89.744291</coordinates>
           <location>
             <name>Baraboo Wisconsin Dells Airport</name>
@@ -47216,7 +47216,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Boscobel</_name>
+          <name>Boscobel</name>
           <coordinates>43.134429 -90.705405</coordinates>
           <location>
             <name>Boscobel Airport</name>
@@ -47227,7 +47227,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Burlington</_name>
+          <name msgctxt="City in Wisconsin, United States">Burlington</name>
           <coordinates>42.678073 -88.276203</coordinates>
           <location>
             <name>Burlington Municipal Airport</name>
@@ -47237,7 +47237,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Camp Douglas</_name>
+          <name>Camp Douglas</name>
           <coordinates>43.922467 -90.271519</coordinates>
           <location>
             <name>Volk / Camp Douglas</name>
@@ -47248,7 +47248,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Clintonville</_name>
+          <name>Clintonville</name>
           <coordinates>44.620535 -88.762323</coordinates>
           <location>
             <name>Clintonville Municipal Airport</name>
@@ -47259,7 +47259,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Eagle River</_name>
+          <name>Eagle River</name>
           <coordinates>45.917176 -89.244299</coordinates>
           <location>
             <name>Eagle River Union Airport</name>
@@ -47270,7 +47270,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Eau Claire</_name>
+          <name>Eau Claire</name>
           <coordinates>44.811349 -91.498494</coordinates>
           <location>
             <name>Chippewa Valley Regional Airport</name>
@@ -47282,7 +47282,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Fond du Lac</_name>
+          <name>Fond du Lac</name>
           <coordinates>43.773045 -88.447051</coordinates>
           <location>
             <name>Fond du Lac County Airport</name>
@@ -47294,7 +47294,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Green Bay</_name>
+          <name>Green Bay</name>
           <coordinates>44.519159 -88.019826</coordinates>
           <location>
             <name>Austin Straubel International Airport</name>
@@ -47306,7 +47306,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Hayward</_name>
+          <name msgctxt="City in Wisconsin, United States">Hayward</name>
           <coordinates>46.013007 -91.484621</coordinates>
           <location>
             <name>Hayward Municipal Airport</name>
@@ -47318,7 +47318,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Janesville</_name>
+          <name>Janesville</name>
           <coordinates>42.682789 -89.018722</coordinates>
           <location>
             <name>Janesville / Rock County</name>
@@ -47330,7 +47330,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Juneau</_name>
+          <name msgctxt="City in Wisconsin, United States">Juneau</name>
           <coordinates>43.405550 -88.705104</coordinates>
           <location>
             <name>Dodge County Airport</name>
@@ -47342,7 +47342,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Kenosha</_name>
+          <name>Kenosha</name>
           <coordinates>42.584742 -87.821185</coordinates>
           <location>
             <name>Kenosha Regional Airport</name>
@@ -47354,7 +47354,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>La Crosse</_name>
+          <name>La Crosse</name>
           <coordinates>43.801356 -91.239581</coordinates>
           <location>
             <name>La Crosse Municipal Airport</name>
@@ -47366,7 +47366,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Ladysmith</_name>
+          <name>Ladysmith</name>
           <coordinates>45.463023 -91.104036</coordinates>
           <location>
             <name>Ruck County Airport</name>
@@ -47377,7 +47377,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Land O' Lakes</_name>
+          <name>Land O' Lakes</name>
           <coordinates>46.161339 -89.218749</coordinates>
           <location>
             <name>Kings Land O' Lakes Airport</name>
@@ -47388,7 +47388,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Lone Rock</_name>
+          <name>Lone Rock</name>
           <coordinates>43.183324 -90.197902</coordinates>
           <location>
             <name>Tri-County Regional Airport</name>
@@ -47400,7 +47400,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Madison</_name>
+          <name msgctxt="City in Wisconsin, United States">Madison</name>
           <coordinates>43.073052 -89.401230</coordinates>
           <location>
             <name>Dane County Regional-Truax Field</name>
@@ -47412,7 +47412,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Manitowoc</_name>
+          <name>Manitowoc</name>
           <coordinates>44.088606 -87.657584</coordinates>
           <location>
             <name>Manitowoc County Airport</name>
@@ -47424,7 +47424,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Marshfield</_name>
+          <name>Marshfield</name>
           <coordinates>44.668852 -90.171799</coordinates>
           <location>
             <name>Marshfield Municipal Airport</name>
@@ -47436,7 +47436,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Medford</_name>
+          <name msgctxt="City in Wisconsin, United States">Medford</name>
           <coordinates>45.138580 -90.340140</coordinates>
           <location>
             <name>Taylor County Airport</name>
@@ -47447,7 +47447,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Menomonie</_name>
+          <name>Menomonie</name>
           <coordinates>44.875518 -91.919342</coordinates>
           <location>
             <name>Menomonie Municipal Airport-Score Field</name>
@@ -47457,7 +47457,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Merrill</_name>
+          <name>Merrill</name>
           <coordinates>45.180522 -89.683459</coordinates>
           <location>
             <name>Merrill Municipal Airport</name>
@@ -47468,7 +47468,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Milwaukee</_name>
+          <name>Milwaukee</name>
           <coordinates>43.038902 -87.906474</coordinates>
           <location>
             <name>General Mitchell International Airport</name>
@@ -47487,7 +47487,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Monroe</_name>
+          <name msgctxt="City in Wisconsin, United States">Monroe</name>
           <coordinates>42.601119 -89.638453</coordinates>
           <location>
             <name>Monroe Municipal Airport</name>
@@ -47498,7 +47498,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Mosinee</_name>
+          <name>Mosinee</name>
           <coordinates>44.793023 -89.703178</coordinates>
           <location>
             <name>Mosinee / Central Wisconsin</name>
@@ -47510,7 +47510,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>New Richmond</_name>
+          <name>New Richmond</name>
           <coordinates>45.123021 -92.536586</coordinates>
           <location>
             <name>New Richmond Municipal Airport</name>
@@ -47521,7 +47521,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Osceola</_name>
+          <name>Osceola</name>
           <coordinates>45.320520 -92.704930</coordinates>
           <location>
             <name>L O Simenstad Municipal Airport</name>
@@ -47532,7 +47532,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Oshkosh</_name>
+          <name>Oshkosh</name>
           <coordinates>44.024706 -88.542614</coordinates>
           <location>
             <name>Wittman Regional Airport</name>
@@ -47544,7 +47544,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Phillips</_name>
+          <name>Phillips</name>
           <coordinates>45.696626 -90.400430</coordinates>
           <location>
             <name>Phillips / Price County</name>
@@ -47556,7 +47556,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Prairie du Chien</_name>
+          <name>Prairie du Chien</name>
           <coordinates>43.051651 -91.141240</coordinates>
           <location>
             <name>Prairie du Chien Municipal Airport</name>
@@ -47567,7 +47567,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Racine</_name>
+          <name>Racine</name>
           <coordinates>42.726131 -87.782852</coordinates>
           <location>
             <name>Batten International Airport</name>
@@ -47578,7 +47578,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Rhinelander</_name>
+          <name>Rhinelander</name>
           <coordinates>45.636623 -89.412075</coordinates>
           <location>
             <name>Rhinelander-Oneida County Airport</name>
@@ -47590,7 +47590,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Rice Lake</_name>
+          <name>Rice Lake</name>
           <coordinates>45.506068 -91.738225</coordinates>
           <location>
             <name>Rice Lake Regional-Carl's Field Airport</name>
@@ -47601,7 +47601,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Sheboygan</_name>
+          <name>Sheboygan</name>
           <coordinates>43.750828 -87.714530</coordinates>
           <location>
             <name>Sheboygan County Memorial Airport</name>
@@ -47613,7 +47613,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Siren</_name>
+          <name>Siren</name>
           <coordinates>45.785782 -92.381028</coordinates>
           <location>
             <name>Burnett County Airport</name>
@@ -47624,7 +47624,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Sparta</_name>
+          <name msgctxt="City in Wisconsin, United States">Sparta</name>
           <coordinates>43.944133 -90.812912</coordinates>
           <location>
             <name>Sparta / Fort McCoy Airport</name>
@@ -47635,7 +47635,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Stevens Point</_name>
+          <name>Stevens Point</name>
           <coordinates>44.523579 -89.574563</coordinates>
           <location>
             <name>Stevens Point Municipal Airport</name>
@@ -47646,7 +47646,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Sturgeon Bay</_name>
+          <name>Sturgeon Bay</name>
           <coordinates>44.834164 -87.377042</coordinates>
           <location>
             <name>Sturgeon Bay</name>
@@ -47658,7 +47658,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Superior</_name>
+          <name>Superior</name>
           <coordinates>46.720774 -92.104080</coordinates>
           <location>
             <name>Richard I. Bong Airport</name>
@@ -47670,7 +47670,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Tomahawk</_name>
+          <name>Tomahawk</name>
           <coordinates>45.471079 -89.729859</coordinates>
           <location>
             <name>Tomahawk Regional Airport</name>
@@ -47680,7 +47680,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name msgctxt="City in Wisconsin, United States">Watertown</_name>
+          <name msgctxt="City in Wisconsin, United States">Watertown</name>
           <coordinates>43.194721 -88.728992</coordinates>
           <location>
             <name>Watertown</name>
@@ -47691,7 +47691,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Waukesha</_name>
+          <name>Waukesha</name>
           <coordinates>43.011678 -88.231481</coordinates>
           <location>
             <name>Waukesha County Airport</name>
@@ -47703,7 +47703,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Waupaca</_name>
+          <name>Waupaca</name>
           <coordinates>44.358035 -89.085946</coordinates>
           <location>
             <name>Waupaca Municipal Airport</name>
@@ -47714,7 +47714,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Wausau</_name>
+          <name>Wausau</name>
           <coordinates>44.959135 -89.630122</coordinates>
           <location>
             <name>Wausau Downtown Airport</name>
@@ -47726,7 +47726,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Wautoma</_name>
+          <name>Wautoma</name>
           <coordinates>44.074700 -89.287897</coordinates>
           <location>
             <name>Wautoma Municipal Airport</name>
@@ -47736,7 +47736,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>West Bend</_name>
+          <name>West Bend</name>
           <coordinates>43.425278 -88.183428</coordinates>
           <location>
             <name>West Bend Municipal Airport</name>
@@ -47747,7 +47747,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Wisconsin Rapids</_name>
+          <name>Wisconsin Rapids</name>
           <coordinates>44.383576 -89.817347</coordinates>
           <location>
             <name>Alexander Field South Wood County Airport</name>
@@ -47759,7 +47759,7 @@
         </city>
         <city>
           <!-- A city in Wisconsin in the United States -->
-          <_name>Woodruff</_name>
+          <name>Woodruff</name>
           <coordinates>45.896341 -89.699037</coordinates>
           <location>
             <name>Minocqua / Woodruff, Lakeland Airport / Noble F. Lee Memorial Field</name>
@@ -47772,12 +47772,12 @@
       </state>
       <state>
         <!-- A state/province/territory in United States -->
-        <_name msgctxt="State in United States">Wyoming</_name>
+        <name msgctxt="State in United States">Wyoming</name>
         <fips-code>US56</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Big Piney</_name>
+          <name>Big Piney</name>
           <coordinates>42.538275 -110.114325</coordinates>
           <location>
             <name>Big Piney-Marbleton Airport</name>
@@ -47789,7 +47789,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name msgctxt="City in Wyoming, United States">Bordeaux</_name>
+          <name msgctxt="City in Wyoming, United States">Bordeaux</name>
           <coordinates>41.936081 -104.844691</coordinates>
           <location>
             <name>Bordeaux</name>
@@ -47799,7 +47799,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name msgctxt="City in Wyoming, United States">Buffalo</_name>
+          <name msgctxt="City in Wyoming, United States">Buffalo</name>
           <coordinates>44.348307 -106.698938</coordinates>
           <location>
             <name>Buffalo Johnson County Airport</name>
@@ -47809,7 +47809,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Casper</_name>
+          <name>Casper</name>
           <coordinates>42.866632 -106.313081</coordinates>
           <location>
             <name>Natrona County International Airport</name>
@@ -47821,7 +47821,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Cheyenne</_name>
+          <name>Cheyenne</name>
           <coordinates>41.139981 -104.820246</coordinates>
           <location>
             <name>Cheyenne Airport</name>
@@ -47833,7 +47833,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Cody</_name>
+          <name>Cody</name>
           <coordinates>44.526342 -109.056531</coordinates>
           <location>
             <name>Cody</name>
@@ -47845,7 +47845,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name msgctxt="City in Wyoming, United States">Douglas</_name>
+          <name msgctxt="City in Wyoming, United States">Douglas</name>
           <coordinates>42.759690 -105.382207</coordinates>
           <location>
             <name>Converse County Airport</name>
@@ -47857,7 +47857,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Evanston</_name>
+          <name>Evanston</name>
           <coordinates>41.268279 -110.963237</coordinates>
           <location>
             <name>Evanston-Uninta County Burns Field</name>
@@ -47869,7 +47869,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Gillette</_name>
+          <name>Gillette</name>
           <coordinates>44.291092 -105.502221</coordinates>
           <location>
             <name>Gillette-Campbell County Airport</name>
@@ -47879,7 +47879,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Greybull</_name>
+          <name>Greybull</name>
           <coordinates>44.489124 -108.056213</coordinates>
           <location>
             <name>South Big Horn County Airport</name>
@@ -47889,7 +47889,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name msgctxt="City in Wyoming, United States">Jackson</_name>
+          <name msgctxt="City in Wyoming, United States">Jackson</name>
           <coordinates>43.479929 -110.762428</coordinates>
           <location>
             <name>Jackson Hole Airport</name>
@@ -47901,7 +47901,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Lander</_name>
+          <name>Lander</name>
           <coordinates>42.833014 -108.730672</coordinates>
           <location>
             <name>Lander</name>
@@ -47913,7 +47913,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Laramie</_name>
+          <name>Laramie</name>
           <coordinates>41.311367 -105.591101</coordinates>
           <location>
             <name>Laramie Regional Airport</name>
@@ -47925,7 +47925,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Pinedale</_name>
+          <name>Pinedale</name>
           <coordinates>42.866610 -109.860986</coordinates>
           <location>
             <name>Ralph Wenz Field Airport</name>
@@ -47935,7 +47935,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Rawlins</_name>
+          <name>Rawlins</name>
           <coordinates>41.791070 -107.238663</coordinates>
           <location>
             <name>Rawlins Municipal Airport</name>
@@ -47947,7 +47947,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Riverton</_name>
+          <name>Riverton</name>
           <coordinates>43.024959 -108.380104</coordinates>
           <location>
             <name>Riverton Regional Airport</name>
@@ -47959,7 +47959,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Rock Springs</_name>
+          <name>Rock Springs</name>
           <coordinates>41.587464 -109.202904</coordinates>
           <location>
             <name>Rock Springs-Sweetwater County Airport</name>
@@ -47971,7 +47971,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Sheridan</_name>
+          <name>Sheridan</name>
           <coordinates>44.797194 -106.956179</coordinates>
           <location>
             <name>Sheridan County Airport</name>
@@ -47983,7 +47983,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Torrington</_name>
+          <name>Torrington</name>
           <coordinates>42.062465 -104.184394</coordinates>
           <location>
             <name>Torrington Municipal Airport</name>
@@ -47993,7 +47993,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>West Thumb</_name>
+          <name>West Thumb</name>
           <coordinates>44.415495 -110.575485</coordinates>
           <location>
             <name>Yellowstone Lake</name>
@@ -48005,7 +48005,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name>Worland</_name>
+          <name>Worland</name>
           <coordinates>44.016901 -107.955372</coordinates>
           <location>
             <name>Worland Municipal Airport</name>
@@ -48017,7 +48017,7 @@
         </city>
         <city>
           <!-- A city in Wyoming in the United States -->
-          <_name msgctxt="City in Wyoming, United States">Wyoming</_name>
+          <name msgctxt="City in Wyoming, United States">Wyoming</name>
           <coordinates>41.477475 -105.636657</coordinates>
           <location>
             <name>Vedauwoo</name>
diff --git a/data/Makefile.am b/data/Makefile.am
index 6cdf18c..7f1e1f4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,7 @@ LOCATIONS_STAMP =
 libmateweatherlocations_DATA = $(libmateweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
 
 %.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po-locations -o `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
 	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
 		gzip -n --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
 	fi
@@ -33,19 +33,16 @@ libmateweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdi
 $(libmateweatherlocations_DATA): $(LOCATIONS_STAMP)
 
 $(LOCATIONS_STAMP): $(libmateweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libmateweatherlocations_data) && \
-	for pofile in $(PO_LOCATIONS); do \
+	$(AM_V_GEN) for pofile in $(PO_LOCATIONS); do \
 		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
-		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libmateweatherlocations_data); \
-		rm -f $$locale/$(libmateweatherlocations_data);		\
-		test -d $$locale && rmdir $$locale;			\
+		GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) -l $$locale --xml --template $< $(top_srcdir)/po-locations/$$locale.po -o $(libmateweatherlocations_data) && \
+		xmllint --noblanks -o Locations.$$locale.xml $(libmateweatherlocations_data); \
+		rm -f $(libmateweatherlocations_data);			\
 		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
 			gzip -n --force Locations.$$locale.xml;		\
 		fi;							\
 	done &&								\
-	xmllint --noblanks -o Locations.xml C/$(libmateweatherlocations_data) && \
-	rm -f C/$(libmateweatherlocations_data) &&				\
-	test -d C && rmdir C &&						\
+	xmllint --noblanks --dtdvalid $(top_srcdir)/data/$(libmateweatherdtd_DATA) -o Locations.xml $(top_srcdir)/data/$(libmateweatherlocations_in_files) && \
 	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
 		gzip -n --force Locations.xml;				\
 	fi &&								\
diff --git a/its/locations.its b/its/locations.its
new file mode 100644
index 0000000..6e0b6c4
--- /dev/null
+++ b/its/locations.its
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+           version="2.0">
+<its:translateRule selector="//mateweather" translate="no"/>
+	<its:translateRule selector="//mateweather//region//name" translate="yes"/>
+</its:rules>
diff --git a/its/locations.loc b/its/locations.loc
new file mode 100644
index 0000000..7245919
--- /dev/null
+++ b/its/locations.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="MateWeather" pattern="*.xml">
+    <documentRule localName="mateweather" target="locations.its"/>
+  </locatingRule>
+</locatingRules>
diff --git a/libmateweather/Makefile.am b/libmateweather/Makefile.am
index 330dd46..a04eeea 100644
--- a/libmateweather/Makefile.am
+++ b/libmateweather/Makefile.am
@@ -85,7 +85,6 @@ BUILT_SOURCES = mateweather-enum-types.c mateweather-enum-types.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mateweather.pc
 
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettingsschema_in_files = org.mate.weather.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
diff --git a/po-locations/LINGUAS b/po-locations/LINGUAS
new file mode 100644
index 0000000..f1f12b0
--- /dev/null
+++ b/po-locations/LINGUAS
@@ -0,0 +1,85 @@
+ang
+ar
+as
+ast
+az
+be@latin
+be
+bg
+bn_IN
+bn
+br
+bs
+ca
+ca@valencia
+crh
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+en@shaw
+eo
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ka
+kn
+ko
+ku
+ky
+lt
+lv
+mai
+mg
+mk
+ml
+mn
+mr
+ms
+nb
+nds
+ne
+nl
+nn
+oc
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+si
+sk
+sl
+sq
+sr@latin
+sr
+sv
+ta
+te
+th
+tr
+uk
+vi
+zh_CN
+zh_HK
+zh_TW
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..31f6faf
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = MATE Desktop Environment team
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
+$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29b2782..9097383 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 #
-[encoding: UTF-8]
 libmateweather/mateweather-prefs.c
 libmateweather/mateweather-timezone.c
-[type: gettext/gsettings]libmateweather/org.mate.weather.gschema.xml.in
+libmateweather/org.mate.weather.gschema.xml.in
 libmateweather/timezone-menu.c
 libmateweather/weather-iwin.c
 libmateweather/weather-metar.c
-- 
cgit v1.2.1