Resolve ambiguous station names

Signed-off-by: Emanoil Kotsev <[email protected]>

1 files changed, 224 insertions, 224 deletions

diff --git a/kweather/data/station_names.txt b/kweather/data/station_names.txt
index 0985d27..b3aa416 100644
--- a/kweather/data/station_names.txt
+++ b/kweather/data/station_names.txt
@@ -15,7 +15,7 @@ HLGT;;AF_LY;Ghat;;;
 HLKF;;AF_LY;Kufra;;;
 HLLB;;AF_LY;Benina;;;
 HLLS;;AF_LY;Sebha;;;
-HLLT;;AF_LY;Tripoli International Airport;;;
+HLLT;;AF_LY;Tripoli INT;;;
 HLTD;;AF_LY;Ghadames;;;
 GMAA;;AF_MO;Agadir;;;
 GMAD;;AF_MO;Agadir Al Massira;;;
@@ -47,11 +47,11 @@ FABL;;AF_ZA;Bloemfontein, Bloemfontein Airport;;;
 FABM;;AF_ZA;Bethlehem Airport;;;
 FABY;;AF_ZA;Beaufort West;;;
 FACL;;AF_ZA;Carolina;;;
-FACT;;AF_ZA;Cape Town, Cape Town International Airport;;;
+FACT;;AF_ZA;Cape Town, Cape Town INT;;;
 FACV;;AF_ZA;Calvinia;;;
-FADA;;AF_ZA;De Aar;;;
-FADN;;AF_ZA;Durban, Durban International Airport;;;
-FADY;;AF_ZA;De Aar;;;
+FADA;;AF_ZA;De Aar A;;;
+FADN;;AF_ZA;Durban, Durban INT;;;
+FADY;;AF_ZA;De Aar B;;;
 FAEL;;AF_ZA;East London, East London Airport;;;
 FAEO;;AF_ZA;Ermelo;;;
 FAER;;AF_ZA;Ellisras;;;
@@ -64,7 +64,7 @@ FAGR;;AF_ZA;Graaff Reinet;;;
 FAGY;;AF_ZA;Greytown;;;
 FAHS;;AF_ZA;Hoedspruit;;;
 FAIR;;AF_ZA;Pretoria Irene ;;;
-FAJS;;AF_ZA;Johannesburg International Airport;;;
+FAJS;;AF_ZA;Johannesburg INT;;;
 FAKD;;AF_ZA;Klerksdorp;;;
 FAKM;;AF_ZA;Kimberley, Kim-Apt;;;
 FALA;;AF_ZA;Lanseria;;;
@@ -124,7 +124,7 @@ ZUUU;;AS_CN;Chengdu;;;
 ZWWW;;AS_CN;Urum-Qi / Diwopu;;;
 ZYTL;;AS_CN;Dalian;;;
 VHCH;;AS_HK;Cheung Chau;;;
-VHHH;;AS_HK;Hong Kong International Airport;;;
+VHHH;;AS_HK;Hong Kong INT;;;
 VAAH;;AS_IN;Ahmadabad;;;
 VAAK;;AS_IN;Akola;;;
 VAAU;;AS_IN;Aurangabad Chikalthan Aerodrome;;;
@@ -189,7 +189,7 @@ VOTR;;AS_IN;Tiruchchirapalli;;;
 VOTV;;AS_IN;Thiruvananthapuram;;;
 VOVR;;AS_IN;Vellore;;;
 KQTA;;AS_JP;ATSUGI, JAPAN NAVAL AIR;;;
-RJAA;;AS_JP;New Tokyo International Airport;;;
+RJAA;;AS_JP;New Tokyo INT;;;
 RJAF;;AS_JP;Matsumoto Airport;;;
 RJAH;;AS_JP;Hyakuri Ab;;;
 RJAI;;AS_JP;Ichikawa ;;;
@@ -198,7 +198,7 @@ RJAM;;AS_JP;Minamitorishima;;;
 RJAO;;AS_JP;Chichijima;;;
 RJAT;;AS_JP;Fuji Ab;;;
 RJAW;;AS_JP;Iwojima;;;
-RJBB;;AS_JP;Kansai International Airport;;;
+RJBB;;AS_JP;Kansai INT;;;
 RJBD;;AS_JP;Nankishirahama Airport;;;
 RJBH;;AS_JP;Hiroshimanishi;;;
 RJBT;;AS_JP;Tajima;;;
@@ -242,7 +242,7 @@ RJFU;;AS_JP;Nagasaki Airport;;;
 RJFW;;AS_JP;Sasebo Usn;;;
 RJFY;;AS_JP;Kanoya Ab;;;
 RJFZ;;AS_JP;Tsuiki Ab;;;
-RJGG;;AS_JP;Nagoya Airport;;;
+RJGG;;AS_JP;Nagoya Airport A;;;
 RJKA;;AS_JP;Amami Airport;;;
 RJKB;;AS_JP;Okinoerabu;;;
 RJKI;;AS_JP;Kikai Island;;;
@@ -251,7 +251,7 @@ RJNF;;AS_JP;Fukui Airport;;;
 RJNG;;AS_JP;Gifu Ab;;;
 RJNH;;AS_JP;Hamamatsu Ab;;;
 RJNK;;AS_JP;Komatsu Ab;;;
-RJNN;;AS_JP;Nagoya Airport;;;
+RJNN;;AS_JP;Nagoya Airport B;;;
 RJNO;;AS_JP;Oki Airport;;;
 RJNT;;AS_JP;Toyama Airport;;;
 RJNY;;AS_JP;Shizuhama Ab;;;
@@ -264,7 +264,7 @@ RJOH;;AS_JP;Miho Ab;;;
 RJOI;;AS_JP;MCAS IWAKUNI,JAPAN;;;
 RJOK;;AS_JP;Kochi Airport;;;
 RJOM;;AS_JP;Matsuyama Airport;;;
-RJOO;;AS_JP;Osaka International Airport;;;
+RJOO;;AS_JP;Osaka INT;;;
 RJOP;;AS_JP;Komatsujima Ab;;;
 RJOR;;AS_JP;Tottori Airport;;;
 RJOS;;AS_JP;Tokushima Ab;;;
@@ -300,7 +300,7 @@ RJTL;;AS_JP;Shimofusa Ab;;;
 RJTO;;AS_JP;Oshima Airport;;;
 RJTQ;;AS_JP;Miyakejima Airport;;;
 RJTR;;AS_JP;Zama Airfield;;;
-RJTT;;AS_JP;Tokyo International Airport;;;
+RJTT;;AS_JP;Tokyo INT;;;
 RJTU;;AS_JP;Utsunomiya Ab;;;
 RJTX;;AS_JP;Yokosuka Fwf;;;
 RJTY;;AS_JP;Yokota Ab;;;
@@ -323,8 +323,8 @@ ROYN;;AS_JP;Yonaguni Airport;;;
 TAKA;;AS_JP;Takao Radar Site;;;
 ZKPY;;AS_KP;Pyongyang;;;
 RKJY;;AS_KR;Yosu Airport;;;
-RKPC;;AS_KR;Cheju International Airport;;;
-RKPK;;AS_KR;Pusan / Kimhae International Airport;;;
+RKPC;;AS_KR;Cheju INT;;;
+RKPK;;AS_KR;Pusan / Kimhae INT;;;
 RKPU;;AS_KR;Ulsan;;;
 RKSF;;AS_KR;Seoul / Yongdungp'O Rokaf Wc;;;
 RKSG;;AS_KR;Pyongtaek Ab;;;
@@ -332,7 +332,7 @@ RKSM;;AS_KR;Seoul E Ab;;;
 RKSO;;AS_KR;Osan Ab;;;
 RKSP;;AS_KR;Paengnyongdo Ab;;;
 RKSQ;;AS_KR;Yeonpyeungdo;;;
-RKSS;;AS_KR;Seoul / Kimp'O International Airport;;;
+RKSS;;AS_KR;Seoul / Kimp'O INT;;;
 RKSU;;AS_KR;Yeoju Range;;;
 RKSW;;AS_KR;Suwon Ab;;;
 RKSX;;AS_KR;Camp Stanley / H-207;;;
@@ -417,7 +417,7 @@ RCFG;;AS_TW;Mazu;;;
 RCFN;;AS_TW;Feng Nin Tw-Afb ;;;
 RCFS;;AS_TW;Chia Tung;;;
 RCGM;;AS_TW;Taoyuan Ab = 589650;;;
-RCKH;;AS_TW;Kaohsiung International Airport;;;
+RCKH;;AS_TW;Kaohsiung INT;;;
 RCKU;;AS_TW;Chiayi Tw-Afb ;;;
 RCKW;;AS_TW;Hengchun;;;
 RCLG;;AS_TW;Taichung Tw-Afb ;;;
@@ -446,7 +446,7 @@ UTTT;;AS_UZ;Tashkent;;;
 VVDN;;AS_VN;Da Nang;;;
 VVNB;;AS_VN;Ha Noi;;;
 VVTS;;AS_VN;Ho Chi Minh;;;
-TAPA;;M__AG;Vc Bird International Airport Antigua;;;
+TAPA;;M__AG;Vc Bird INT Antigua;;;
 TKPN;;M__AG;Charlestown / Newcast;;;
 TRPM;;M__AG;Blackburne / Plymouth;;;
 TNCB;;M__AN;Flamingo Airport, Bonaire;;;
@@ -456,21 +456,21 @@ TNCM;;M__AN;Juliana Airport, Saint Maarten;;;
 TJBQ;;M__PR;Aquadilla, Rafael Hernandez Airport;;;
 TJMZ;;M__PR;Mayaguez, Eugenio Maria de Hostos Airport;;;
 TJPS;;M__PR;Ponce, Mercedita Airport;;;
-TJSJ;;M__PR;San Juan, Luis Munoz Marin International Airport;;;
+TJSJ;;M__PR;San Juan, Luis Munoz Marin INT;;;
 MYAK;;M__BS;Congo Town, Andros Island;;;
 TTCP;;M__TT;Crown Pt./ Scarborou;;;
-TTPP;;M__TT;Piarco International Airport, Trinidad;;;
+TTPP;;M__TT;Piarco INT, Trinidad;;;
 TTPT;;M__TT;Crown Point Airport, Tobago;;;
 CYEG;;CA_AB;Edmonton International;;;
 CYYC;;CA_AB;Calgary International;;;
 CZVL;;CA_AB;Edmonton / Villeneuve;;;
 CYQQ;;CA_BC;Comox;;;
-CYVR;;CA_BC;Vancouver International AirPort;;;
+CYVR;;CA_BC;Vancouver INT;;;
 CYXX;;CA_BC;Abbotsford;;;
 CYYD;;CA_BC;Smithers;;;
-CYYJ;;CA_BC;Victoria Int. Airport;;;
+CYYJ;;CA_BC;Victoria INT;;;
 CYZT;;CA_BC;Port Hardy;;;
-CYWG;;CA_MB;Winnipeg Int. Airport;;;
+CYWG;;CA_MB;Winnipeg INT;;;
 CYYQ;;CA_MB;Churchill, Man.;;;
 CYCH;;CA_NB;Chatham Can-Mil;;;
 CYFC;;CA_NB;Fredericton;;;
@@ -478,16 +478,16 @@ CYQM;;CA_NB;Moncton;;;
 CYSJ;;CA_NB;Saint John;;;
 CYAY;;CA_NF;Saint Anthony Airport;;;
 CYJT;;CA_NF;Stephenville;;;
-CYQX;;CA_NF;Gander Int. Airport;;;
+CYQX;;CA_NF;Gander INT;;;
 CYYR;;CA_NF;Goose;;;
 CYYT;;CA_NF;St. John's;;;
 CYAW;;CA_NS;Shearwater;;;
-CYHZ;;CA_NS;Halifax International Airport ;;;
+CYHZ;;CA_NS;Halifax INT ;;;
 CYQY;;CA_NS;Sydney;;;
 CYZX;;CA_NS;Greenwood;;;
 CYFB;;CA_NT;Iqaluit;;;
 CYZF;;CA_NT;Yellowknife;;;
-CYOW;;CA_ON;Ottawa Int Airport;;;
+CYOW;;CA_ON;Ottawa INT;;;
 CYQG;;CA_ON;Windsor;;;
 CYTR;;CA_ON;Trenton;;;
 CYYZ;;CA_ON;Toronto;;047;
@@ -497,7 +497,7 @@ CYHU;;CA_QC;Saint Hubert Airport ;;;
 CYMX;;CA_QC;Montreal / Mirabel;;;
 CYND;;CA_QC;Gatineau Airport;;;
 CYQB;;CA_QC;Quebec;;;
-CYUL;;CA_QC;Montreal / Pierre Elliot Trudeau International Airport;;;
+CYUL;;CA_QC;Montreal / Pierre Elliot Trudeau INT;;;
 CYZV;;CA_QC;Sept-Iles;;;
 CYBU;;CA_SK;Nipawin;;;
 CYQR;;CA_SK;Regina;;;
@@ -539,11 +539,11 @@ CWCF;;CA_MB;Berens River CS;;;
 CWCH;;CA_ON;Atikokan;;;
 CWCI;;CA_ON;Caribou Island;;;
 CWCJ;;CA_ON;Pukaskwa;;;
-CWCL;;CA_BC;Clinton;;;
+CWCL;;CA_BC;Clinton, B. C.;;;
 CWCM;;CA_MB;Carberry Mcdc;;;
 CWCN;;CA_NU;Malloch Dome;;;
 CWCO;;CA_ON;Collingwood;;;
-CWCQ;;CA_ON;Chatham;;;
+CWCQ;;CA_ON;Chatham AWRS;;;
 CWCS;;CA_QC;Cote-Ste-Cath Mot;;;
 CWCT;;CA_AB;Coronation;;;
 CWCU;;CA_ON;Barrie;;;
@@ -587,7 +587,7 @@ CWEQ;;CA_MB;Swan River;;;
 CWER;;CA_QC;Ile D'Orleans;;;
 CWES;;CA_BC;Cape Scott Light;;;
 CWET;;CA_ON;Egbert;;;
-CWEU;;CA_NT;Eureka;;;
+CWEU;;CA_NT;Eureka (CA);;;
 CWEV;;CA_MB;Ellice River;;;
 CWEW;;CA_QC;L'Assomption;;;
 CWEZ;;CA_BC;Saturna Island;;;
@@ -597,17 +597,17 @@ CWFF;;CA_SK;Melfort;;;
 CWFG;;CA_BC;Sartine Island;;;
 CWFH;;CA_NF;St. Shotts;;;
 CWFJ;;CA_AB;Cardston;;;
-CWFL;;CA_NT;Fort Reliance;;;
+CWFL;;CA_NT;Fort Reliance B;;;
 CWFM;;CA_BC;Chatham Point Lighthouse;;;
 CWFN;;CA_SK;Cree Lake;;;
-CWFP;;CA_NF;Nain;;;
+CWFP;;CA_NF;Nain A;;;
 CWFQ;;CA_QC;Frelighsburg;;;
 CWFR;;CA_BC;Horsefly River;;;
 CWFU;;CA_NF;Little Macatina;;;
-CWFW;;CA_QC;Baie Comeau;;;
+CWFW;;CA_QC;Baie Comeau B;;;
 CWFX;;CA_NT;Colville Lake;;;
 CWFY;;CA_NF;Conne River;;;
-CWFZ;;CA_NT;Fort Reliance;;;
+CWFZ;;CA_NT;Fort Reliance A;;;
 CWGB;;CA_BC;Ballenas Island;;;
 CWGD;;CA_ON;Goderich;;;
 CWGF;;CA_ON;Garden River;;;
@@ -623,7 +623,7 @@ CWGT;;CA_NU;Sisters Island;;;
 CWGU;;CA_MB;Gypsumville;;;
 CWGV;;CA_ON;Carp Radar Site;;;
 CWGW;;CA_BC;Sparwood;;;
-CWGX;;CA_MB;Gillam;;;
+CWGX;;CA_MB;Gillam B;;;
 CWGY;;CA_AB;Esther 1;;;
 CWGZ;;CA_NU;Grise Fiord Airport;;;
 CWHA;;CA_AB;Highvale;;;
@@ -655,7 +655,7 @@ CWIL;;CA_NT;Hat Island;;;
 CWIM;;CA_ON;Upsala Radar Site;;;
 CWIO;;CA_BC;Iskut River;;;
 CWIP;;CA_QC;Pointe Noire;;;
-CWIQ;;CA_SK;Primrose Lake;;;
+CWIQ;;CA_SK;Primrose Lake 1;;;
 CWIR;;CA_BC;Victoria Marine;;;
 CWIS;;CA_QC;Charlevoix CS;;;
 CWIT;;CA_QC;Saint Clothilde;;;
@@ -668,16 +668,16 @@ CWJB;;CA_QC;Ste Foy CS;;;
 CWJC;;CA_NU;Ennadai Lake;;;
 CWJD;;CA_MB;Grand Rapids;;;
 CWJG;;CA_BC;Ivory Island Light;;;
-CWJH;;CA_SK;Southend;;;
+CWJH;;CA_SK;Southend AWRS;;;
 CWJI;;CA_SK;Assiniboia Airport;;;
 CWJM;;CA_ON;Upper Rideau Lake;;;
 CWJN;;CA_YK;Herschel Island;;;
 CWJO;;CA_QC;Jonquiere;;;
 CWJP;;CA_NS;Porter Lake;;;
-CWJR;;CA_BC;Creston;;;
+CWJR;;CA_BC;Creston AWRS;;;
 CWJT;;CA_QC;St Jovite;;;
-CWJU;;CA_BC;Langara;;;
-CWJV;;CA_BC;Vernon;;;
+CWJU;;CA_BC;Langara B;;;
+CWJV;;CA_BC;Vernon A;;;
 CWJW;;CA_AB;Jasper Warden;;;
 CWJY;;CA_NU;Yathkyed Lake;;;
 CWJZ;;CA_NU;Dubawnt Lake;;;
@@ -694,7 +694,7 @@ CWKS;;CA_BC;Sikanni Chief;;;
 CWKV;;CA_BC;Hope Slide;;;
 CWKW;;CA_NF;Cape Kakkiviak;;;
 CWKX;;CA_BC;Dease Lake Coastal Station;;;
-CWLA;;CA_BC;Langara;;;
+CWLA;;CA_BC;Langara A;;;
 CWLB;;CA_AB;Lac La Biche;;;
 CWLC;;CA_BC;Lucy Island;;;
 CWLE;;CA_SK;Lucky Lake;;;
@@ -715,9 +715,9 @@ CWLZ;;CA_SK;Candle Lake;;;
 CWMA;;CA_BC;Masset A;;;
 CWMD;;CA_NT;Mould Bay Camp;;;
 CWME;;CA_AB;Cathedral Point;;;
-CWMH;;CA_NF;Mary's Harbour;;;
+CWMH;;CA_NF;Mary's Harbour A;;;
 CWMI;;CA_NB;Miscou Island;;;
-CWMJ;;CA_QC;Maniwaki;;;
+CWMJ;;CA_QC;Maniwaki A;;;
 CWMM;;CA_BC;P. Meadows Coastal Station;;;
 CWMN;;CA_QC;Mcgill Radar Site;;;
 CWMP;;CA_SK;Powder Lake;;;
@@ -727,7 +727,7 @@ CWMS;;CA_BC;Mcinnes Island;;;
 CWMT;;CA_NT;Lac La Martre;;;
 CWMU;;CA_NT;Rampart River;;;
 CWMV;;CA_QC;St Charles Creek;;;
-CWMW;;CA_QC;Maniwaki;;;
+CWMW;;CA_QC;Maniwaki B;;;
 CWMX;;CA_AB;Mildred Lake;;;
 CWNC;;CA_ON;Cobourg;;;
 CWND;;CA_NT;Pelly Island;;;
@@ -754,9 +754,9 @@ CWOH;;CA_QC;Ste Agathe Des Mont;;;
 CWOI;;CA_YK;Ivvavik Park;;;
 CWOK;;CA_SK;Elbow;;;
 CWOL;;CA_NS;Sable Island Man;;;
-CWON;;CA_YK;Dawson;;;
-CWOU;;CA_SK;Primrose Lake;;;
-CWOY;;CA_SK;Wynyard;;;
+CWON;;CA_YK;Dawson AWRS;;;
+CWOU;;CA_SK;Primrose Lake 2;;;
+CWOY;;CA_SK;Wynyard AWRS;;;
 CWPA;;CA_ON;Henderickson;;;
 CWPB;;CA_ON;Beausoleil Island;;;
 CWPC;;CA_ON;Port Colborne;;;
@@ -774,7 +774,7 @@ CWPR;;CA_BC;Princeton;;;
 CWPS;;CA_ON;Long Point;;;
 CWPU;;CA_BC;Puntzi Mountain;;;
 CWPX;;CA_NT;Cape Peel West;;;
-CWPY;;CA_AB;Fort Chipewyan;;;
+CWPY;;CA_AB;Fort Chipewyan AWRS;;;
 CWPZ;;CA_BC;Burns Lake CS;;;
 CWQC;;CA_BC;Port Alberni;;;
 CWQE;;CA_ON;Toronto Headland;;;
@@ -783,7 +783,7 @@ CWQG;;CA_QC;Valcartier;;;
 CWQH;;CA_QC;Lennoxville;;;
 CWQJ;;CA_NF;Sedco 710;;;
 CWQK;;CA_BC;Race Rocks;;;
-CWQL;;CA_AB;Lethbridge;;;
+CWQL;;CA_AB;Lethbridge AWRS;;;
 CWQM;;CA_QC;Cap Rouge;;;
 CWQO;;CA_QC;Ile Bicquette;;;
 CWQP;;CA_ON;Point Petre;;;
@@ -853,13 +853,13 @@ CWUX;;CA_QC;La Baie;;;
 CWUY;;CA_QC;Rouyn;;;
 CWVA;;CA_NF;Bonavista;;;
 CWVB;;CA_BC;Bonilla Island Light;;;
-CWVC;;CA_SK;Swift Current;;;
+CWVC;;CA_SK;Swift Current AWRS;;;
 CWVD;;CA_BC;Broughton Island;;;
 CWVE;;CA_QC;Valleyfield;;;
 CWVF;;CA_BC;Sand Heads CS;;;
 CWVH;;CA_NT;Storm Hills;;;
 CWVI;;CA_AB;Vegreville;;;
-CWVK;;CA_BC;Vernon;;;
+CWVK;;CA_BC;Vernon B;;;
 CWVN;;CA_SK;Val Marie Southeast;;;
 CWVO;;CA_AB;Vauxhall Cda;;;
 CWVP;;CA_SK;Cypress Hills Park;;;
@@ -898,7 +898,7 @@ CWXR;;CA_NT;Croker River;;;
 CWXV;;CA_NU;Back River;;;
 CWXW;;CA_BC;Alexis River;;;
 CWYE;;CA_SK;Outlook Pfra;;;
-CWYG;;CA_PE;Charlottetown;;;
+CWYG;;CA_PE;Charlottetown B;;;
 CWYH;;CA_NT;Rae Lakes;;;
 CWYJ;;CA_BC;Victoria University;;;
 CWYK;;CA_NF;Cape Kiglapait;;;
@@ -956,7 +956,7 @@ CXMI;;CA_NS;McNabs Island;;;
 CXMM;;CA_AB;Fort McMurray CS;;;
 CXMY;;CA_NS;Malay Falls;;;
 CXNM;;CA_NS;North Mountain;;;
-CXOX;;CA_SK;La Ronge;;;
+CXOX;;CA_SK;La Ronge A;;;
 CXPV;;CA_AB;Prairie River;;;
 CXQA;;CA_NT;Qavvik Lake;;;
 CXRH;;CA_NF;Rocky Harbour CS;;;
@@ -968,7 +968,7 @@ CXTP;;CA_NF;Terra Nova National Park CS;;;
 CXTV;;CA_NT;Trail Valley;;;
 CXWN;;CA_MB;Winnipeg The Forks;;;
 CXXX;;CA_SK;Cluff Lake;;;
-CXZU;;CA_AB;Whitecourt;;;
+CXZU;;CA_AB;Whitecourt B;;;
 CYAD;;CA_QC;La Grande 1;;;
 CYAH;;CA_QC;La Grande 4;;;
 CYAJ;;CA_YK;Komakuk Beach Airport;;;
@@ -976,7 +976,7 @@ CYAM;;CA_ON;Sault Ste Marie;;;
 CYAS;;CA_YK;Kangirsuk;;;
 CYAZ;;CA_BC;Tofino Airport;;;
 CYBB;;CA_NU;Pelly Bay Airport;;;
-CYBC;;CA_QC;Baie Comeau;;;
+CYBC;;CA_QC;Baie Comeau A;;;
 CYBD;;CA_QC;Bella Coola Airport;;;
 CYBK;;CA_NT;Baker Lake;;;
 CYBL;;CA_BC;Campbell River Airport;;;
@@ -1003,14 +1003,14 @@ CYDC;;CA_BC;Princeton Airport;;;
 CYDF;;CA_NF;Deer Lake;;;
 CYDM;;CA_YK;Ross River Airport;;;
 CYDN;;CA_MB;Dauphin;;;
-CYDP;;CA_NF;Nain;;;
+CYDP;;CA_NF;Nain B;;;
 CYDQ;;CA_BC;Dawson Creek Airport;;;
 CYED;;CA_AB;Edmonton Namao;;;
 CYEK;;CA_NU;Arviat Airport;;;
 CYEL;;CA_ON;Elliot Lake;;;
 CYEN;;CA_SK;Estevan;;;
 CYET;;CA_AB;Edson;;;
-CYEU;;CA_NU;Eureka;;;
+CYEU;;CA_NU;Eureka Man;;;
 CYEV;;CA_NT;Inuvik;;;
 CYFO;;CA_MB;Flin Flon Airport;;;
 CYFR;;CA_NT;Fort Resolution;;;
@@ -1026,7 +1026,7 @@ CYGR;;CA_QC;Iles De La Madeleineque;;;
 CYGT;;CA_NU;Igloolik Airport;;;
 CYGV;;CA_QC;Havre St Pierre;;;
 CYGW;;CA_QC;Kuujjuarapik;;;
-CYGX;;CA_MB;Gillam;;;
+CYGX;;CA_MB;Gillam A;;;
 CYHA;;CA_QC;Quaqtaq Airport;;;
 CYHB;;CA_SK;Hudson Bay;;;
 CYHD;;CA_ON;Dryden Airport;;;
@@ -1062,7 +1062,7 @@ CYLU;;CA_NU;Kangiksualujjuaq A;;;
 CYLW;;CA_BC;Kelowna Airport;;;
 CYMA;;CA_YK;Mayo Airport;;;
 CYMD;;CA_NT;Mould Bay;;;
-CYMH;;CA_NF;Mary's Harbour;;;
+CYMH;;CA_NF;Mary's Harbour B;;;
 CYMJ;;CA_SK;Moose Jaw;;;
 CYML;;CA_QC;Charlevoix Airport;;;
 CYMM;;CA_AB;Fort Mcmurray;;;
@@ -1098,7 +1098,7 @@ CYQF;;CA_AB;Red Deer;;;
 CYQH;;CA_YK;Watson Lake;;;
 CYQI;;CA_NS;Yarmouth;;;
 CYQK;;CA_ON;Kenora;;;
-CYQL;;CA_AB;Lethbridge;;;
+CYQL;;CA_AB;Lethbridge Airport;;;
 CYQT;;CA_ON;Thunder Bay;;;
 CYQU;;CA_AB;Grande Prairie;;;
 CYQV;;CA_SK;Yorkton;;;
@@ -1140,7 +1140,7 @@ CYUT;;CA_NU;Repulse Bay Airport;;;
 CYUV;;CA_NU;Longstaff Blf Airport;;;
 CYUX;;CA_NT;Hall Beach;;;
 CYUY;;CA_QC;Rouyn Airport;;;
-CYVC;;CA_SK;La Ronge;;;
+CYVC;;CA_SK;La Ronge B;;;
 CYVM;;CA_NU;Broughton Island Airport;;;
 CYVO;;CA_QC;Val D'Or;;;
 CYVP;;CA_QC;Kuujjuaq;;;
@@ -1172,7 +1172,7 @@ CYXZ;;CA_ON;Wawa;;;
 CYYB;;CA_ON;North Bay;;;
 CYYE;;CA_BC;Fort Nelson;;;
 CYYF;;CA_BC;Penticton;;;
-CYYG;;CA_PE;Charlottetown;;;
+CYYG;;CA_PE;Charlottetown A;;;
 CYYH;;CA_NU;Spence Bay Airport;;;
 CYYL;;CA_MB;Lynn Lake;;;
 CYYU;;CA_ON;Kapuskasing;;;
@@ -1184,25 +1184,25 @@ CYZH;;CA_AB;Slave Lake;;;
 CYZP;;CA_BC;Sandspit;;;
 CYZR;;CA_ON;Sarnia Airport;;;
 CYZS;;CA_NT;Coral Harbour;;;
-CYZU;;CA_AB;Whitecourt;;;
+CYZU;;CA_AB;Whitecourt A;;;
 CYZW;;CA_YK;Teslin;;;
 CYZY;;CA_BC;Mackenzie;;;
 CZAG;;CA_QC;La Grande IV;;;
 CZBF;;CA_NB;Bathurst Airport;;;
-CZCP;;CA_NT;Cape Parry;;;
-CZDI;;CA_NF;Churchill Falls;;;
+CZCP;;CA_NT;Cape Parry A;;;
+CZDI;;CA_NF;Churchill Falls B;;;
 CZEM;;CA_QC;Eastmain River Airport;;;
 CZFA;;CA_YK;Faro Airport;;;
 CZFM;;CA_NT;Fort Mcpherson Airport;;;
 CZFN;;CA_NT;Fort Norman Airport;;;
-CZNB;;CA_ON;North Bay;;;
+CZNB;;CA_ON;North Bay AWRS;;;
 CZOC;;CA_YK;Old Crow;;;
 CZPC;;CA_AB;Pincher Creek Airport;;;
 CZPK;;CA_NT;Paulatuk;;;
 CZST;;CA_BC;Stewart Airport;;;
-CZUB;;CA_YK;Tuktoyaktuk;;;
-CZUE;;CA_NT;Cape Parry;;;
-CZUM;;CA_NF;Churchill Falls;;;
+CZUB;;CA_YK;Tuktoyaktuk AWRS;;;
+CZUE;;CA_NT;Cape Parry B;;;
+CZUM;;CA_NF;Churchill Falls A;;;
 CZWN;;CA_AB;Wainwright;;;
 KWDD;;CA_ON;Belle River;;;
 LATI;;EU_AB;Tirana;;;
@@ -1281,7 +1281,7 @@ EDDM;true;EU_DE;München;;;
 EDDN;true;EU_DE;Nürnberg;;;
 EDDP;true;EU_DE;Leipzig-Schkeuditz;;;
 EDDR;true;EU_DE;Saarbrücken;;;
-EDDS;true;EU_DE;Stuttgart;;;
+EDDS;true;EU_DE;Stuttgart-Echterdingen;;;
 EDDT;;EU_DE;Berlin-Tegel;;;
 EDDV;true;EU_DE;Hannover;;;
 EDDW;true;EU_DE;Bremen;;;
@@ -1577,7 +1577,7 @@ EQYG;;EU_GR;NSA Souda Bay;;;
 LGAD;;EU_GR;Andravida Airport ;;;
 LGAL;;EU_GR;Alexandroupoli Airport ;;;
 LGAT;;EU_GR;Athinai Airport ;;;
-LGAV;;EU_GR;Athens Eleftherios Venizelos International Airport;;;
+LGAV;;EU_GR;Athens Eleftherios Venizelos INT;;;
 LGBL;;EU_GR;Anchialos Airport ;;;
 LGEL;;EU_GR;Elefsis Airport ;;;
 LGHI;;EU_GR;Chios Airport ;;;
@@ -1788,13 +1788,13 @@ EYPA;;EU_LT;Palanga Intl.;;;
 EYSA;;EU_LT;Siauliai Intl./Mil.;;;
 EYVI;;EU_LT;Vilnius;;;
 ELLX;;EU_LU;Luxembourg / Luxembourg;;;
-EVLA;;EU_LV;Liepaja International Airport;;;
-EVRA;;EU_LV;Riga International Airport;;;
+EVLA;;EU_LV;Liepaja INT;;;
+EVRA;;EU_LV;Riga INT;;;
 UMRR;;EU_LV;Riga;;;
 UMRW;;EU_LV;Ventspils;;;
 LUBL;;EU_MD;Baltsi-Leadoveni - The North of Moldova;;;
 LUCH;;EU_MD;Kaxul - The South of Moldova;;;
-LUKK;;EU_MD;Chisinau International Airport;;;
+LUKK;;EU_MD;Chisinau INT;;;
 UKII;;EU_MD;Kisinev;;;
 LWOH;;EU_MK;Ohrid;;;
 LWSK;;EU_MK;Skopje-Petrovec;;;
@@ -2020,7 +2020,7 @@ UWSS;;EU_RU;Saratov / Tsentralny;;;
 UWUU;;EU_RU;Ufa;;;
 UWWW;;EU_RU;Samara;;;
 ESCF;;EU_SE;Linkoping / Malmen;;;
-ESCL;;EU_SE;Soderhamn;;;
+ESCL;;EU_SE;Soderhamn B;;;
 ESCM;;EU_SE;Uppsala;;;
 ESDA;;EU_SE;Ljungbyhed, Ljungbyhed, SWE-AFB;;;
 ESDB;;EU_SE;Angelholm;;;
@@ -2048,7 +2048,7 @@ ESNO;;EU_SE;Ornskoldsvik Airport;;;
 ESNQ;;EU_SE;Kiruna Airport;;;
 ESNS;;EU_SE;Skelleftea Airport;;;
 ESNU;;EU_SE;Umea Flygplats;;;
-ESNY;;EU_SE;Soderhamn;;;
+ESNY;;EU_SE;Soderhamn A;;;
 ESOE;;EU_SE;Orebro Private ;;;
 ESOK;;EU_SE;Karlstad ;;;
 ESOW;;EU_SE;Vasteras / Hasslo;;;
@@ -2072,16 +2072,16 @@ LJMS;;EU_SI;Murska Sobota;;;
 LJPZ;;EU_SI;Portoroz;;;
 LYPZ;;EU_SI;Portoroz / Secovlje;;;
 LKKZ;;EU_SK;Kosice;;;
-LKPP;;EU_SK;Piestany;;;
-LKSL;;EU_SK;Sliac;;;
+LKPP;;EU_SK;Piestany A;;;
+LKSL;;EU_SK;Sliac B;;;
 LZIB;;EU_SK;Bratislava Ivanka;;;
 LZKC;;EU_SK;Kamenica Nad Cirochou;;;
 LZKZ;;EU_SK;Kosice, Barca;;;
 LZLU;;EU_SK;Lucenec;;;
 LZNI;;EU_SK;Nitra;;;
 LZPE;;EU_SK;Prievidza;;;
-LZPP;;EU_SK;Piestany;;;
-LZSL;;EU_SK;Sliac;;;
+LZPP;;EU_SK;Piestany B;;;
+LZSL;;EU_SK;Sliac A;;;
 LZTT;;EU_SK;Poprad / Tatry;;;
 LZZI;;EU_SK;Dolny Hricov;;;
 EQYR;;EU_SP;Rota, Naval Station;;;
@@ -2231,7 +2231,7 @@ EGFH;;EU_UK;Swansea;;;
 EGGD;;EU_UK;Bristol;:RDPMS;;
 EGGP;;EU_UK;Liverpool;:RCPMS;;
 EGGW;;EU_UK;Luton;:RBPMS;;
-EGHD;;EU_UK;Plymouth;:RD2PMS;;
+EGHD;;EU_UK;Plymouth/Roborough;:RD2PMS;;
 EGHE;;EU_UK;Scilly Isles;:RD2PMS;;
 EGHH;;EU_UK;Bournemouth;:RIPMS;;
 EGHI;;EU_UK;Southampton;:RIPMS;;
@@ -2267,7 +2267,7 @@ EGOY;;EU_UK;West Freugh;;;
 EGPA;;EU_UK;Kirkwall Airport;;;
 EGPB;;EU_UK;Sumburgh;:RQPMS;;
 EGPC;;EU_UK;Wick;:RQPMS;;
-EGPD;;EU_UK;Aberdeen;:RQPMS;;
+EGPD;;EU_UK;Aberdeen/Dyce;:RQPMS;;
 EGPE;;EU_UK;Inverness;:RQPMS;;
 EGPF;;EU_UK;Glasgow;:RAPMS;;
 EGPH;;EU_UK;Edinburgh;:RAPMS;;
@@ -2342,15 +2342,15 @@ LYNI;;EU_YU;Nis;;;
 LYPG;;EU_YU;Podgorica Titograd ;;;
 LYPR;;EU_YU;Pristina;;;
 LYTI;;EU_YU;Podgorica / Golubovci;;;
-OMAA;;ME_AE;Abu Dhabi International Airport;;;
+OMAA;;ME_AE;Abu Dhabi INT;;;
 OMAB;;ME_AE;Buhasa;;;
 OMAD;;ME_AE;Abu Dhabi Bateen Airport;;;
-OMAL;;ME_AE;Al Ain International Airport;;;
-OMDB;;ME_AE;Dubai International Airport;;;
+OMAL;;ME_AE;Al Ain INT;;;
+OMDB;;ME_AE;Dubai INT;;;
 OMFJ;;ME_AE;Fujairah;;;
-OMRK;;ME_AE;Ras Al Khaimah International Airport;;;
-OMSJ;;ME_AE;Sharjah International Airport;;;
-OBBI;;ME_BH;Bahrain International Airport ;;;
+OMRK;;ME_AE;Ras Al Khaimah INT;;;
+OMSJ;;ME_AE;Sharjah INT;;;
+OBBI;;ME_BH;Bahrain INT ;;;
 DAAD;;AF_DZ;Bou-Saada;;;
 DAAE;;AF_DZ;Bejaia;;;
 DAAF;;AF_DZ;Aoulef ;;;
@@ -2390,7 +2390,7 @@ DAUO;;AF_DZ;El Oued;;;
 DAUT;;AF_DZ;Timimoun;;;
 DAUU;;AF_DZ;Ouargla;;;
 DAUZ;;AF_DZ;In Amenas;;;
-LLBG;;ME_IL;Ben-Gurion International Airport;;;
+LLBG;;ME_IL;Ben-Gurion INT;;;
 LLBS;;ME_IL;Beer-Sheva;;;
 LLET;;ME_IL;Eilat;;;
 LLHA;;ME_IL;Sde-Haifa Haifa;;;
@@ -2412,19 +2412,19 @@ OOBR;;ME_OM;Buraimi;;;
 OOFD;;ME_OM;Fahud;;;
 OOKB;;ME_OM;Khassab;;;
 OOMA;;ME_OM;Masirah;;;
-OOMS;;ME_OM;Seeb, International Airport;;;
+OOMS;;ME_OM;Seeb, INT;;;
 OOSA;;ME_OM;Salalah;;;
 OOSH;;ME_OM; Sohar Majis;;;
 OOSQ;;ME_OM;Saiq;;;
 OOSR;;ME_OM;Sur;;;
 OOTH;;ME_OM;Thumrait;;;
 KQIR;;ME_QA;Al Udeid;;;
-OTBD;;ME_QA;Doha International Airport;;;
+OTBD;;ME_QA;Doha INT;;;
 OEAB;;ME_SA;Abha;;;
 OEAH;;ME_SA;Al Ahsa;;;
 OEBA;;ME_SA;Al Baha;;;
 OEBH;;ME_SA;Bisha;;;
-OEDF;;ME_SA;Dammam-King Fahd International Airport;;;
+OEDF;;ME_SA;Dammam-King Fahd INT;;;
 OEDR;;ME_SA;Dhahran;;;
 OEDW;;ME_SA;Dawadmi;;;
 OEGN;;ME_SA;Gizan;;;
@@ -2433,7 +2433,7 @@ OEGT;;ME_SA;Guriat;;;
 OEHL;;ME_SA;Hail;;;
 OEJB;;ME_SA;Jubail Naval ;;;
 OEJD;;ME_SA;Jeddah ;;;
-OEJN;;ME_SA;Jeddah King Abdul Aziz International Airport ;;;
+OEJN;;ME_SA;Jeddah King Abdul Aziz INT ;;;
 OEKK;;ME_SA;Hafr Al-Batin;;;
 OEKM;;ME_SA;Khamis Mushait;;;
 OEMA;;ME_SA;Madinah;;;
@@ -2441,7 +2441,7 @@ OEMK;;ME_SA;Makkah;;;
 OENG;;ME_SA;Najran;;;
 OEPA;;ME_SA;Al Qaysumah;;;
 OERF;;ME_SA;Rafha;;;
-OERK;;ME_SA;King Khaled International Airport;;;
+OERK;;ME_SA;King Khaled INT;;;
 OERR;;ME_SA;Arar;;;
 OERY;;ME_SA;Riyadh;;;
 OESH;;ME_SA;Sharurah;;;
@@ -2477,13 +2477,13 @@ MMCN;;NA_MX;Ciudad Obregon;;;
 MMCP;;NA_MX;Campeche, Camp.;;;
 MMCS;;NA_MX;Ciudad Juarez International ;;;
 MMCT;;NA_MX;Chichen-Itza;;;
-MMCU;;NA_MX;Chihuahua International Airport;;;
+MMCU;;NA_MX;Chihuahua INT;;;
 MMCV;;NA_MX;Ciudad Victoria Airport;;;
 MMCZ;;NA_MX;Cozumel Civ / Mil ;;;
 MMDO;;NA_MX;Durango Airport;;;
 MMEP;;NA_MX;Tepic, Nay.;;;
 MMGL;;NA_MX;Don Miguel / Guadalaj;;;
-MMGM;;NA_MX;Guaymas International Airport;;;
+MMGM;;NA_MX;Guaymas INT;;;
 MMHO;;NA_MX;Hermosillo, Son.;;;
 MMIA;;NA_MX;Colima ;;;
 MMIO;;NA_MX;Saltillo, Coah.;;;
@@ -2491,11 +2491,11 @@ MMIT;;NA_MX;Ixtepec Ox;;;
 MMLC;;NA_MX;Lazaro Cardenas;;;
 MMLM;;NA_MX;Los Mochis Airport;;;
 MMLO;;NA_MX;Del Bajio / Leon;;;
-MMLP;;NA_MX;La Paz International Airport;;;
+MMLP;;NA_MX;La Paz INT;;;
 MMLT;;NA_MX;Loreto, B. C. S.;;;
 MMMA;;NA_MX;Matamoros International ;;;
 MMMD;;NA_MX;Merida / lic Manuel Crecencio;;;
-MMML;;NA_MX;Mexicali International Airport ;;;
+MMML;;NA_MX;Mexicali INT ;;;
 MMMM;;NA_MX;Morelia New;;;
 MMMT;;NA_MX;Minatitlan;;;
 MMMV;;NA_MX;Monclova, Coah.;;;
@@ -2511,17 +2511,17 @@ MMPN;;NA_MX;Uruapan / Gen Rayon;;;
 MMPR;;NA_MX;Puerto Vallarta / Lic;;;
 MMPS;;NA_MX;Puerto Escondido ;;;
 MMQT;;NA_MX;Queretaro, Qro.;;;
-MMRX;;NA_MX;Reynosa International Airport ;;;
+MMRX;;NA_MX;Reynosa INT ;;;
 MMSD;;NA_MX;San Jose Del Cabo ;;;
 MMSP;;NA_MX;San Luis Potosi, S. L. P.;;;
 MMTC;;NA_MX;Torreon, Coah.;;;
 MMTG;;NA_MX;Tuxtla Gutierrez, Chis.;;;
-MMTJ;;NA_MX;Tijuana International Airport ;;;
+MMTJ;;NA_MX;Tijuana INT ;;;
 MMTL;;NA_MX;Tulancingo ;;;
 MMTM;;NA_MX;Tampico / Gen Fj Mina;;;
 MMTO;;NA_MX;Toluca / Jose Maria ;;;
 MMTP;;NA_MX;Tapachula ;;;
-MMUN;;NA_MX;Cancun International Airport;;;
+MMUN;;NA_MX;Cancun INT;;;
 MMVA;;NA_MX;Villahermosa ;;;
 MMVR;;NA_MX;Veracruz / Las Bajadas / General Heriberto Jara;;;
 MMZC;;NA_MX;Zacatecas Airport;;;
@@ -2624,7 +2624,7 @@ SLCA;;M__BO;Camiri;;;
 SLCB;;M__BO;Cochabamba;;;
 SLCN;;M__BO;Charana;;;
 SLCO;;M__BO;Cobija;;;
-SLCP;;M__BO;Concepcion;;;
+SLCP;;M__BO;Concepcion C;;;
 SLET;;M__BO;Santa Cruz / El Trompillo;;;
 SLGY;;M__BO;Guayaramerin;;;
 SLJE;;M__BO;San Jose De Chiquitos;;;
@@ -2770,7 +2770,7 @@ SCFA;;M__CL;Antofagasta;;;
 SCHA;;M__CL;Copiapo;;;
 SCHR;;M__CL;Cochrane;;;
 SCIC;;M__CL;Curico;;;
-SCIE;;M__CL;Concepcion;;;
+SCIE;;M__CL;Concepcion A;;;
 SCIP;;M__CL;Isla De Pascua;;;
 SCLL;;M__CL;Vallenar;;;
 SCRA;;M__CL;Chanaral;;;
@@ -2838,7 +2838,7 @@ MUVR;;M__CU;Varadero, Matanzas;;;
 MUVT;;M__CU;Las Tunas, Las Tunas;;;
 MDBH;;M__DO;Barahona;;;
 MDHE;;M__DO;Herrera;;;
-MDLR;;M__DO;La Romana International Airport;;;
+MDLR;;M__DO;La Romana INT;;;
 MDPC;;M__DO;Punta Cana;;;
 MDPP;;M__DO;Puerto Plata International;;;
 MDSD;;M__DO;Las Americas;;;
@@ -2878,8 +2878,8 @@ MHIC;;M__HN;Islas Del Cisne;;;
 MHLC;;M__HN;La Ceiba Airport ;;;
 MHLE;;M__HN;La Esperanza;;;
 MHLM;;M__HN;La Mesa San Pedro Sula ;;;
-MHNJ;;M__HN;Guanaja;;;
-MHNO;;M__HN;Guanaja;;;
+MHNJ;;M__HN;Guanaja A;;;
+MHNO;;M__HN;Guanaja B;;;
 MHPL;;M__HN;Puerto Lempira;;;
 MHRO;;M__HN;Roatan;;;
 MHSC;;M__HN;Coronel Enrique Soto Cano Air Base;;;
@@ -2942,7 +2942,7 @@ SPUR;;M__PE;Piura;;;
 SPYL;;M__PE;Talara;;;
 SPZO;;M__PE;Cuzco;;;
 SGAS;;M__PY;Asuncion / Aeropuerto;;;
-SGCO;;M__PY;Concepcion;;;
+SGCO;;M__PY;Concepcion B;;;
 SGEN;;M__PY;Encarnacion;;;
 SGES;;M__PY;Aeropuerto Guarany;;;
 SGME;;M__PY;Mariscal Estigarribia;;;
@@ -3130,7 +3130,7 @@ PAEL;;US_AK;Elfin Cove;AKZ022;;
 PAEM;;US_AK;Emmonak, Emmonak Airport;;;
 PAEN;;US_AK;Kenai;AKZ017;;
 PAFA;;US_AK;Fairbanks;AKZ007;;
-PAFB;;US_AK;Wainwright;AKZ001;;
+PAFB;;US_AK;Wainwright AAF;AKZ001;;
 PAFE;;US_AK;Kake;AKZ026;;
 PAFM;;US_AK;Ambler;AKZ003;;
 PAGA;;US_AK;Galena, Edward G. Pitka Sr. Airport;;;
@@ -3203,13 +3203,13 @@ PPIZ;;US_AK;Point Lay;AKZ001;;
 KANB;;US_AL;Anniston;ALZ019;;
 KAUO;;US_AL;Auburn;ALZ047;;
 KBFM;;US_AL;Mobile Downtown;ALZ061;;
-KBHM;;US_AL;Birmingham;ALZ024;019;
+KBHM;;US_AL;Birmingham INT;ALZ024;019;
 KDCU;;US_AL;PRYOR FIELD;;;
 KDHN;;US_AL;Dothan;ALZ066;;
 KGAD;;US_AL;Gadsden;ALZ018;;
 KGZH;;US_AL;EVERGREEN MIDDLETON FIELD;;;
 KHSV;;US_AL;Huntsville;ALZ006;;
-KMGM;;US_AL;Montgomery;ALZ044;109;
+KMGM;;US_AL;Montgomery Dannelly Field;ALZ044;109;
 KMOB;;US_AL;Mobile Regional Airport;ALZ061;;
 KMSL;;US_AL;Muscle Shoals;ALZ002;;
 KMXF;;US_AL;Montgomery-Maxwell AFB;ALZ044;109;
@@ -3220,22 +3220,22 @@ KBVX;;US_AR;Batesville;ARZ016;;
 KELD;;US_AR;El Dorado;ARZ073;;
 KFLP;;US_AR;Flippin;ARZ004;;
 KFSM;;US_AR;Fort Smith;;085;
-KFYV;;US_AR;Fayetteville;ARZ010;085;
-KHOT;;US_AR;Hot Springs;ARZ042;;
+KFYV;;US_AR;Fayetteville Drake Field;ARZ010;085;
+KHOT;;US_AR;Hot Springs Memorial Airport;ARZ042;;
 KHRO;;US_AR;Harrison;ARZ003;085;
 KJBR;;US_AR;Jonesboro;ARZ026;085;
 KLIT;;US_AR;Little Rock;ARZ044;;
 KLRF;;US_AR;Little Rock AFB;ARZ044;;
 KPBF;;US_AR;Pine Bluff;ARZ056;;
 KROG;;US_AR;Rogers;ARZ001;;
-KSGT;;US_AR;Stuttgart;ARZ057;;
+KSGT;;US_AR;Stuttgart Municipal Airport;ARZ057;;
 KSLG;;US_AR;Siloam Springs;ARZ001;;
 KTXK;;US_AR;Texarkana;ARZ070;;
 KVBT;;US_AR;Bentonville;ARZ001;;
 K0E4;;US_AZ;Payson;AZZ018;;
 K13A;;US_AZ;Nogales;AZZ034;;
 KCGZ;;US_AZ;Casa Granda;AZZ028;;
-KDUG;;US_AZ;Douglas;AZZ030;;
+KDUG;;US_AZ;Douglas Bisbee INT;AZZ030;;
 KDVT;;US_AZ;Phoenix-Deer Valley;AZZ023;phx;
 KFFZ;;US_AZ;Mesa-Falcon Field;AZZ023;;
 KFHU;;US_AZ;Fort Huachuca;AZZ035;;
@@ -3266,12 +3266,12 @@ KBLU;;US_CA;BLUE CANYON AIRPORT;;;
 KBUO;;US_CA;Beaumont;CAZ056;;
 KBUR;;US_CA;Burbank;CAZ047;;
 KBYS;;US_CA;Fort Irwin/Barstow, Bicycle Lake Army Airfield;;;
-KCCR;;US_CA;Concord;CAZ007;;
+KCCR;;US_CA;Concord Buchanan;CAZ007;;
 KCEC;;US_CA;Crescent City;CAZ001;;
 KCIC;;US_CA;Chico;CAZ016;;
 KCMA;;US_CA;Camarillo;CAZ040;;
 KCNO;;US_CA;Chino;CAZ048;;
-KCRQ;;US_CA;Carlsbad;CAZ043;;
+KCRQ;;US_CA;Carlsbad McClellan-Palomar;CAZ043;;
 KCZZ;;US_CA;Campo;CAZ058;;
 KDAG;;US_CA;Daggett;CAZ028;;
 KEDW;;US_CA;Edwards AFB;CAZ025;;
@@ -3280,9 +3280,9 @@ KEMT;;US_CA;El Monte;CAZ047;;
 KFAT;;US_CA;Fresno;CAZ020;078;
 KFCH;;US_CA;Fresno-Chandler;CAZ020;078;
 KFUL;;US_CA;Fullerton;CAZ042;;
-KHHR;;US_CA;Hawthorne;CAZ041;;
-KHWD;;US_CA;Hayward;CAZ007;;
-KIPL;;US_CA;Imperial;CAZ033;;
+KHHR;;US_CA;Hawthorne Municipal 1;CAZ041;;
+KHWD;;US_CA;Hayward Air Terminal;CAZ007;;
+KIPL;;US_CA;Imperial County Airport;CAZ033;;
 KIYK;;US_CA;Inyokern;CAZ025;;
 KLAX;;US_CA;Los Angeles;CAZ041;lax;
 KLGB;;US_CA;Long Beach;CAZ041;lax;
@@ -3311,7 +3311,7 @@ KNXP;;US_CA;Twentynine Palms;CAZ028;;
 KNZY;;US_CA;San Diego-North Island;;san;
 KO87;;US_CA;Shelter Cove;CAZ001;;
 KOAK;;US_CA;Oakland;CAZ007;sfo;
-KONT;;US_CA;Ontario;CAZ048;lax;
+KONT;;US_CA;Ontario INT;CAZ048;lax;
 KOXR;;US_CA;Oxnard;CAZ040;;
 KPAO;;US_CA;Palo Alto;CAZ006;sfo;
 KPMD;;US_CA;Palmdale;CAZ054;;
@@ -3337,7 +3337,7 @@ KSJC;;US_CA;San Jose-Santa Clara;CAZ008;sfo;
 KSMF;;US_CA;Sacramento-Woodland;CAZ017;;
 KSMO;;US_CA;Santa Monica;CAZ041;;
 KSMX;;US_CA;Santa Maria;CAZ035;090;
-KSNA;;US_CA;Santa Ana;CAZ042;lax;
+KSNA;;US_CA;Santa Ana WAYNE ORANGE CTY;CAZ042;lax;
 KSNS;;US_CA;Salinas;CAZ009;;
 KSQL;;US_CA;San Carlos;CAZ006;;
 KSTS;;US_CA;Santa Rosa;CAZ005;;
@@ -3349,12 +3349,12 @@ KUKI;;US_CA;Ukiah;CAZ003;;
 KVBG;;US_CA;Vandenberg Range;CAZ039;;
 KVIS;;US_CA;Visalia;CAZ021;;
 KVNY;;US_CA;Van Nuys;CAZ047;;
-KWJF;;US_CA;Lancaster;CAZ059;;
+KWJF;;US_CA;Lancaster Fox Airfield;CAZ059;;
 K1V1;;US_CO;Rifle;COZ003;;
 K2V9;;US_CO;Gunnison (2);COZ012;;
 K4V5;;US_CO;Durango Awrs;COZ022;;
 KAFF;;US_CO;Air Force;COZ071;;
-KAKO;;US_CO;Akron;COZ049;;
+KAKO;;US_CO;Akron Colorado Plains;COZ049;;
 KALS;;US_CO;Alamosa;COZ063;;
 KAPA;;US_CO;Denver-Aurora;COZ040;den;
 KASE;;US_CO;Aspen;COZ010;068;
@@ -3389,10 +3389,10 @@ KGON;;US_CT;Groton;CTZ012;hfd;
 KHFD;;US_CT;Hartford;CTZ002;hfd;
 KHVN;;US_CT;New Haven;CTZ010;;
 KOXC;;US_CT;Oxford;CTZ010;;
-KDCA;;US_DC;Washington;DCZ013;dca;
+KDCA;;US_DC;Washington National;DCZ013;dca;
 KIAD;;US_DC;Washington/Dulles;DCZ013;dca;
 KDOV;;US_DE;Dover;DEZ002;076;
-KILG;;US_DE;Wilmington;DEZ001;076;
+KILG;;US_DE;Wilmington New Castle;DEZ001;076;
 K40J;;US_FL;PERRY-FOLEY AIRPORT;;;
 KAPF;;US_FL;Naples;FLZ069;;
 KAQQ;;US_FL;Apalachicola;FLZ015;;
@@ -3413,7 +3413,7 @@ KGIF;;US_FL;WINTER HAVENS GILBERT AIRPORT ;;;
 KGNV;;US_FL;Gainesville;FLZ036;;
 KHRT;;US_FL;Hurlburt Field;;;
 KHST;;US_FL;Homestead AFB;FLZ074;;
-KJAX;;US_FL;Jacksonville;FLZ025;;
+KJAX;;US_FL;Jacksonville INT;FLZ025;;
 KLAL;;US_FL;Lakeland;FLZ052;;
 KLEE;;US_FL;LEESBURG REGIONAL AIRPORT;;;
 KMAI;;US_FL;Marianna;FLZ011;;
@@ -3439,8 +3439,8 @@ KPIE;;US_FL;St Petersburg / Clearwater;FLZ050;;
 KPMP;;US_FL;POMPANO BEACH AIRPARK;;;
 KPNS;;US_FL;Pensacola;FLZ002;;
 KRRF;;US_FL;New Port Richey;FLZ051;;
-KRSW;;US_FL;Fort Myers (Southwest Florida International);FLZ065;;
-KSFB;;US_FL;Sanford;FLZ046;;
+KRSW;;US_FL;Fort Myers (Southwest Florida INT);FLZ065;;
+KSFB;;US_FL;Orlando Sanford Airport;FLZ046;;
 KSPG;;US_FL;St Petersburg;FLZ050;;
 KSRQ;;US_FL;Sarasota;FLZ060;;
 KTIX;;US_FL;Titusville;FLZ047;;
@@ -3450,13 +3450,13 @@ KTPA;;US_FL;Tampa;FLZ051;;
 KTTS;;US_FL;Titusville, NASA Shuttle Landing Facility;;;
 KVPS;;US_FL;Valparaiso;FLZ006;;
 KVRB;;US_FL;Vero Beach;FLZ054;;
-KABY;;US_GA;Albany;GAZ125;;
-KAGS;;US_GA;Augusta;GAZ065;;
+KABY;;US_GA;Albany Southwest Georgia;GAZ125;;
+KAGS;;US_GA;Augusta Bush Field;GAZ065;;
 KAHN;;US_GA;Athens;GAZ036;atl;
 KAMG;;US_GA;Alma;GAZ134;;
 KATL;;US_GA;Atlanta;GAZ033;atl;
 KAYS;;US_GA;Waycross;GAZ151;;
-KCSG;;US_GA;Columbus;GAZ089;;
+KCSG;;US_GA;Columbus Metropolitan Airport;GAZ089;;
 KFTY;;US_GA;West Atlanta;GAZ033;;
 KLHW;;US_GA;Fort Stewart;GAZ138;;
 KLSF;;US_GA;Fort Benning;GAZ090;;
@@ -3489,7 +3489,7 @@ KAMW;;US_IA;Ames;IAZ048;043;
 KAWG;;US_IA;Washington;IAZ077;;
 KAXA;;US_IA;Algona;IAZ005;043;
 KBNW;;US_IA;Boone;IAZ047;;
-KBRL;;US_IA;Burlington;IAZ089;058;
+KBRL;;US_IA;Burlington Regional;IAZ089;058;
 KCAV;;US_IA;Clarion;IAZ025;;
 KCBF;;US_IA;Council Bluffs;IAZ069;;
 KCCY;;US_IA;Charles City;IAZ018;;
@@ -3497,7 +3497,7 @@ KCID;;US_IA;Cedar Rapids;IAZ052;;
 KCIN;;US_IA;Carroll;IAZ045;;
 KCNC;;US_IA;Chariton;IAZ084;;
 KCSQ;;US_IA;Creston;IAZ082;;
-KCWI;;US_IA;Clinton;IAZ066;;
+KCWI;;US_IA;Clinton Municipal Airport;IAZ066;;
 KDBQ;;US_IA;Dubuque;IAZ042;;
 KDEH;;US_IA;Decorah;IAZ010;;
 KDNS;;US_IA;Denison;IAZ044;;
@@ -3506,7 +3506,7 @@ KDVN;;US_IA;Davenport;IAZ068;;
 KEBS;;US_IA;Webster City;;;
 KEOK;;US_IA;Keokuk Municipal;;;
 KEST;;US_IA;Estherville;IAZ004;;
-KFFL;;US_IA;Fairfield;IAZ087;;
+KFFL;;US_IA;Fairfield / Travis Air Force Base;IAZ087;;
 KFOD;;US_IA;Fort Dodge;IAZ035;043;
 KFSW;;US_IA;Fort Madison;IAZ099;;
 KICL;;US_IA;Clarinda;IAZ091;;
@@ -3515,7 +3515,7 @@ KLRJ;;US_IA;Le Mars, Le Mars Municipal Airport;;;
 KMCW;;US_IA;Mason City;IAZ017;044;
 KMIW;;US_IA;Marshalltown;IAZ049;;
 KMUT;;US_IA;Muscatine;IAZ067;;
-KMXO;;US_IA;Monticello;IAZ053;;
+KMXO;;US_IA;Monticello Municipal Airport;IAZ053;;
 KOLZ;;US_IA;Oelwen;IAZ029;;
 KORC;;US_IA;Orange City;IAZ012;;
 KOTM;;US_IA;Ottumwa;IAZ086;058;
@@ -3526,7 +3526,7 @@ KSHL;;US_IA;Sheldon;IAZ012;;
 KSLB;;US_IA;Storm Lake;IAZ022;;
 KSPW;;US_IA;Spencer;IAZ014;043;
 KSUX;;US_IA;Sioux City;IAZ031;043;
-KTNU;;US_IA;Newton;IAZ061;;
+KTNU;;US_IA;Newton Municipal;IAZ061;;
 K27U;;US_ID;Salmon (2);IDZ009;;
 K4SV;;US_ID;Strevell;;;
 K77M;;US_ID;Malta;IDZ022;;
@@ -3534,7 +3534,7 @@ KBOI;;US_ID;Boise;IDZ014;;
 KBYI;;US_ID;Burley;IDZ022;;
 KCOE;;US_ID;Coeur d'Alene;IDZ002;;
 KIDA;;US_ID;Idaho Falls;IDZ020;;
-KLWS;;US_ID;Lewiston;IDZ003;;
+KLWS;;US_ID;Lewiston Nez Perce Co;IDZ003;;
 KMLD;;US_ID;Malad City;IDZ022;;
 KMUO;;US_ID;Mountain Home;IDZ014;;
 KMYL;;US_ID;McCall;IDZ011;;
@@ -3548,15 +3548,15 @@ KTWF;;US_ID;Twin Falls;IDZ015;;
 KU15;;US_ID;Challis;IDZ018;;
 KU78;;US_ID;Soda Springs;IDZ023;;
 KALN;;US_IL;Alton;ILZ100;;
-KARR;;US_IL;Aurora;ILZ013;;
+KARR;;US_IL;Aurora Municipal Airport;ILZ013;;
 KBLV;;US_IL;Belleville;ILZ101;;
-KBMI;;US_IL;Bloomington;ILZ038;;
+KBMI;;US_IL;Bloomington REgional Airport;ILZ038;;
 KCGX;;US_IL;Chicago-Lakefront;ILZ014;ord;
 KCIR;;US_IL;Cairo;ILZ092;;
 KCMI;;US_IL;Champaign;ILZ045;059;
 KCPS;;US_IL;East St Louis;ILZ101;;
 KDEC;;US_IL;Decatur;ILZ053;;
-KDNV;;US_IL;Danville;ILZ046;;
+KDNV;;US_IL;Danville Vermilion County Airport;ILZ046;;
 KDPA;;US_IL;Chicago-DuPage;ILZ014;ord;
 KGBG;;US_IL;Galesburg;ILZ027;;
 KMDH;;US_IL;Carbondale;ILZ084;;
@@ -3569,21 +3569,21 @@ KMWA;;US_IL;Marion;ILZ085;;
 KORD;;US_IL;Chicago-O'Hare;ILZ013;ord;
 KPIA;;US_IL;Peoria;ILZ029;;
 KRFD;;US_IL;Rockford;ILZ003;;
-KSLO;;US_IL;Salem;ILZ070;;
+KSLO;;US_IL;Salem-Leckrone Airport;ILZ070;;
 KSPI;;US_IL;Springfield;ILZ051;;
 KUIN;;US_IL;Quincy;ILZ095;;
-KBMG;;US_IN;Bloomington;INZ062;;
-KEKM;;US_IN;Elkhart;INZ005;;
+KBMG;;US_IN;Bloomington Monroe County;INZ062;;
+KEKM;;US_IN;Elkhart Municipal;INZ005;;
 KEVV;;US_IN;Evansville;INZ086;;
 KFWA;;US_IN;Fort Wayne;INZ018;;
 KGUS;;US_IN;Peru;INZ023;;
 KGYY;;US_IN;Gary;INZ001;;
 KHUF;;US_IN;Terre Haute;INZ051;;
 KIND;;US_IN;Indianapolis;INZ047;;
-KLAF;;US_IN;Lafayette;INZ029;;
+KLAF;;US_IN;Lafayette Purdue;INZ029;;
 KMIE;;US_IN;Muncie;INZ041;;
 KSBN;;US_IN;South Bend;INZ004;;
-K1K5;;US_KS;Elkhart;KSZ084;;
+K1K5;;US_KS;Elkhart-Morton County Airport;KSZ084;;
 K3KM;;US_KS;Wichita-Jabara;KSZ083;084;
 KCNK;;US_KS;Concordia;KSZ020;071;
 KCNU;;US_KS;Chanute;KSZ096;084;
@@ -3610,13 +3610,13 @@ K5I3;;US_KY;Pikeville;KYZ120;;
 KBWG;;US_KY;Bowling Green;KYZ071;087;
 KCVG;;US_KY;Covington;KYZ092;074;
 KEHR;;US_KY;Henderson;KYZ018;;
-KFFT;;US_KY;Frankfort;KYZ035;;
+KFFT;;US_KY;Frankfort Capital City Airport;KYZ035;;
 KFTK;;US_KY;Fort Knox;KYZ028;;
 KHOP;;US_KY;Fort Campbell;KYZ017;;
-KJKL;;US_KY;Jackson;KYZ112;087;
+KJKL;;US_KY;Jackson CARROLL AIRPORT;KYZ112;087;
 KLEX;;US_KY;Lexington;KYZ041;074;
 KLOU;;US_KY;Louisville;KYZ030;073;
-KLOZ;;US_KY;London;;087;
+KLOZ;;US_KY;London Corbin Airport;;087;
 KOWB;;US_KY;Owensboro;KYZ019;086;
 KPAH;;US_KY;Paducah;KYZ005;;
 KSDF;;US_KY;Louisville-Standiford Field;KYZ030;073;
@@ -3626,8 +3626,8 @@ K7R3;;US_LA;Amelia / Lake Palourd;;;
 K7R4;;US_LA;Intracoastal;LAZ052;;
 K7R5;;US_LA;Cameron;LAZ051;;
 K7R8;;US_LA;South Marsh Island;LAZ053;;
-K9F2;;US_LA;Fourchon Supplementary Aviation Weather Reporting Station;;;
-KAEX;;US_LA;Alexandria;LAZ028;115;
+K9F2;;US_LA;Fourchon Supplementary AWRS;;;
+KAEX;;US_LA;Alexandria INT;LAZ028;115;
 KARA;;US_LA;New Iberia;LAZ053;;
 KAXO;;US_LA;Grand Isle;LAZ061;;
 KBAD;;US_LA;Barksdale Air Force Base;;;
@@ -3636,7 +3636,7 @@ KDTN;;US_LA;Shreveport Downtown;LAZ001;107;
 KESF;;US_LA;Alexandria-Esler;LAZ028;115;
 KHUM;;US_LA;Houma;LAZ066;;
 KLCH;;US_LA;Lake Charles;LAZ041;121;
-KLFT;;US_LA;Lafayette;LAZ044;121;
+KLFT;;US_LA;Lafayette Regional Airport;LAZ044;121;
 KMLU;;US_LA;Monroe;LAZ014;;
 KMSY;;US_LA;New Orleans;LAZ062;121;
 KNBG;;US_LA;New Orleans NAS;LAZ062;121;
@@ -3653,7 +3653,7 @@ KBED;;US_MA;Bedford;MAZ005;;
 KBOS;;US_MA;Boston;MAZ015;bos;
 KBVY;;US_MA;Beverly;MAZ007;;
 KCEF;;US_MA;Chicopee Falls / Westover Air Force Base;;;
-KCQX;;US_MA;Chatham;MAZ022;bos;
+KCQX;;US_MA;Chatham Municipal Airport;MAZ022;bos;
 KEWB;;US_MA;New Bedford;MAZ017;;
 KFIT;;US_MA;Fitchburg, Fitchburg Municipal Airport;;;
 KFMH;;US_MA;Falmouth-Otis AFB;MAZ022;;
@@ -3674,9 +3674,9 @@ KHGR;;US_MD;Hagerstown;MDZ003;;
 KMTN;;US_MD;Baltimore;MDZ011;dca;
 KNHK;;US_MD;Patuxent River;MDZ014;;
 KSBY;;US_MD;Salisbury;MDZ022;;
-K3B1;;US_ME;Greenville;MEZ010;034;
+K3B1;;US_ME;Greenville Municipal Airport 2;MEZ010;034;
 K40B;;US_ME;Clayton Lake;;;
-KAUG;;US_ME;Augusta;MEZ021;034;
+KAUG;;US_ME;Augusta State Airport;MEZ021;034;
 KBGR;;US_ME;Bangor;MEZ015;034;
 KBHB;;US_ME;Bar Harbor;MEZ029;;
 KCAR;;US_ME;Caribou;MEZ002;;
@@ -3684,13 +3684,13 @@ KFVE;;US_ME;Frenchville;MEZ002;;
 KHUL;;US_ME;Houlton;MEZ002;;
 KIWI;;US_ME;Wiscasset;MEZ026;;
 KIZG;;US_ME;FRYEBURG EASTERN SLOPES RGNL;;;
-KLEW;;US_ME;Lewiston;MEZ020;;
+KLEW;;US_ME;Auburn-Lewiston;MEZ020;;
 KMLT;;US_ME;Millinocket;MEZ015;;
 KNHZ;;US_ME;Brunswick;MEZ024;049;
 KPQI;;US_ME;Presque Isle;MEZ002;;
-KPWM;;US_ME;Portland;MEZ024;049;
+KPWM;;US_ME;Portland Int. Jetport;MEZ024;049;
 KRKD;;US_ME;Rockland;MEZ027;;
-KSFM;;US_ME;Sanford;MEZ023;;
+KSFM;;US_ME;Sanford Regional Airport;MEZ023;;
 KWVL;;US_ME;Waterville;MEZ021;;
 KAPN;;US_MI;Alpena;MIZ024;;
 KARB;;US_MI;Ann Arbor;MIZ075;dtw;
@@ -3703,11 +3703,11 @@ KDET;;US_MI;Detroit;MIZ076;dtw;
 KDTW;;US_MI;Detroit-Taylor;MIZ076;dtw;
 KESC;;US_MI;Escanaba;MIZ013;;
 KFNT;;US_MI;Flint;MIZ061;dtw;
-KGRR;;US_MI;Grand Rapids;MIZ057;;
+KGRR;;US_MI;Gerald R. Ford INT;MIZ057;;
 KHTL;;US_MI;Houghton Lake;MIZ034;;
 KIMT;;US_MI;Iron Mountain;MIZ011;;
 KIWD;;US_MI;Ironwood;MIZ009;;
-KJXN;;US_MI;Jackson;MIZ074;dtw;
+KJXN;;US_MI;Jackson COUNTY-REYNOLDS;MIZ074;dtw;
 KLAN;;US_MI;Lansing;MIZ066;;
 KMBL;;US_MI;Manistee;MIZ031;;
 KMBS;;US_MI;Saginaw;MIZ053;;
@@ -3723,17 +3723,17 @@ KPTK;;US_MI;Pontiac;MIZ069;;
 KSAW;;US_MI;Sawyer AFB;MIZ077;;
 KTVC;;US_MI;Traverse City;MIZ020;;
 KYIP;;US_MI;Ypsilanti;MIZ075;dtw;
-KAXN;;US_MN;Alexandria;MNZ041;;
+KAXN;;US_MN;Chandler Field;MNZ041;;
 KBJI;;US_MN;Bemidji;MNZ009;;
 KBRD;;US_MN;Brainerd;MNZ034;;
 KD45;;US_MN;Warroad;MNZ005;;
 KDLH;;US_MN;Duluth;MNZ019;;
 KDTL;;US_MN;Detroit Lakes;MNZ027;;
-KELO;;US_MN;Ely;MNZ019;;
+KELO;;US_MN;Ely Municipal Airport;MNZ019;;
 KFCM;;US_MN;Minneapolis [2];MNZ060;msp;
 KFFM;;US_MN;Fergus Falls;MNZ031;;
 KFRM;;US_MN;Fairmont;MNZ091;;
-KGPZ;;US_MN;Grand Rapids;MNZ026;;
+KGPZ;;US_MN;Grand Rapids/Itasca County;MNZ026;;
 KHIB;;US_MN;Hibbing;MNZ019;;
 KINL;;US_MN;International Falls;MNZ010;;
 KMIC;;US_MN;Minneapolis [3];MNZ060;msp;
@@ -3743,13 +3743,13 @@ KMSP;;US_MN;Minneapolis;MNZ060;msp;
 KOTG;;US_MN;Worthington;MNZ089;;
 KP39;;US_MN;Pequot Lakes;MNZ034;;
 KP61;;US_MN;Grand Marais;MNZ021;;
-KRST;;US_MN;Rochester;MNZ087;030;
+KRST;;US_MN;Rochester INT;MNZ087;030;
 KRWF;;US_MN;Redwood Falls;MNZ073;;
 KSTC;;US_MN;St Cloud;MNZ051;;
 KSTP;;US_MN;St Paul;MNZ062;;
 KTVF;;US_MN;Thief River Falls;MNZ013;;
 KCGI;;US_MO;Cape Girardeau;MOZ087;;
-KCOU;;US_MO;Columbia;MOZ041;072;
+KCOU;;US_MO;Columbia Regional Airport;MOZ041;072;
 KGVW;;US_MO;Grandview;MOZ037;;
 KIRK;;US_MO;Kirksville;MOZ017;058;
 KJEF;;US_MO;Jefferson City;MOZ048;072;
@@ -3757,7 +3757,7 @@ KJLN;;US_MO;Joplin;MOZ088;084;
 KMCI;;US_MO;Kansas City-Gladstone;MOZ029;071;
 KMKC;;US_MO;Kansas City;MOZ037;071;
 KP35;;US_MO;Spickard;MOZ015;;
-KSGF;;US_MO;Springfield;MOZ095;084;
+KSGF;;US_MO;Springfield-Branson National;MOZ095;084;
 KSTJ;;US_MO;St Joseph;MOZ020;057;
 KSTL;;US_MO;St Louis;MOZ064;stl;
 KSUS;;US_MO;St Louis-Spirit;MOZ064;stl;
@@ -3765,12 +3765,12 @@ KSZL;;US_MO;Sedalia;MOZ045;;
 KTBN;;US_MO;Fort Leonard;MOZ070;072;
 KVIH;;US_MO;Vichy-Rolla;MOZ058;072;
 KCBM;;US_MS;Columbus-W Point-Starkville;MSZ031;109;
-KGLH;;US_MS;Greenville;;108;
+KGLH;;US_MS;Greenville Municipal Airport;;108;
 KGPT;;US_MS;Gulfport;MSZ081;;
-KGTR;;US_MS;Columbus;MSZ031;109;
-KGWO;;US_MS;Greenwood;MSZ025;108;
+KGTR;;US_MS;Columbus Regional Airport;MSZ031;109;
+KGWO;;US_MS;Greenwood-Leflore Airport;MSZ025;108;
 KHEZ;;US_MS;Natchez;MSZ060;;
-KJAN;;US_MS;Jackson;MSZ048;108;
+KJAN;;US_MS;Jackson INT;MSZ048;108;
 KMCB;;US_MS;McComb;MSZ070;;
 KMEI;;US_MS;Meridian;MSZ052;109;
 KNMM;;US_MS;Meridian-Lauderdale;MSZ052;109;
@@ -3798,7 +3798,7 @@ KMLS;;US_MT;Miles City;MTZ032;;
 KMQM;;US_MT;Monida;;;
 KMSO;;US_MT;Missoula;MTZ005;013;
 KOLF;;US_MT;Wolf Point;MTZ020;;
-KSDY;;US_MT;Sidney;MTZ024;;
+KSDY;;US_MT;Sidney-Richland;MTZ024;;
 KWEY;;US_MT;West Yellowstone (2);MTZ015;025;
 KWYS;;US_MT;West Yellowstone;MTZ015;025;
 K2DP;;US_NC;Dare County Gunnery Range;;;
@@ -3806,20 +3806,20 @@ KAVL;;US_NC;Asheville;NCZ053;;
 KCLT;;US_NC;Charlotte;NCZ071;100;
 KECG;;US_NC;Elizabeth City;NCZ016;;
 KEWN;;US_NC;New Bern;NCZ093;;
-KFAY;;US_NC;Fayetteville;NCZ088;100;
+KFAY;;US_NC;Fayetteville Regional;NCZ088;100;
 KFBG;;US_NC;Fort Bragg;NCZ088;;
 KGSB;;US_NC;Goldsboro;NCZ078;;
 KGSO;;US_NC;Greensboro;NCZ022;rdu;
 KHAT;;US_NC;Cape Hatteras;NCZ047;;
 KHFF;;US_NC;Mackall U. S. Army Airfield;;;
 KHKY;;US_NC;Hickory;NCZ056;;
-KHSS;;US_NC;Hot Springs;NCZ048;;
-KILM;;US_NC;Wilmington;NCZ101;;
+KHSS;;US_NC;Hot Springs AWRS;NCZ048;;
+KILM;;US_NC;Wilmington INT;NCZ101;;
 KINT;;US_NC;Winston-Salem;NCZ021;;
 KISO;;US_NC;Kinston;NCZ091;;
 KNCA;;US_NC;New River;NCZ098;;
 KNKT;;US_NC;Cherry Point, Marine Corps Air Station;;;
-KOAJ;;US_NC;Jacksonville;NCZ098;;
+KOAJ;;US_NC;Jacksonville Albert J Ellis Airport;NCZ098;;
 KPOB;;US_NC;Pope AFB;NCZ088;;
 KRDU;;US_NC;Raleigh-Durham;NCZ041;rdu;
 KRWI;;US_NC;Rocky Mount;NCZ028;rdu;
@@ -3829,7 +3829,7 @@ KDVL;;US_ND;Devils Lake;NDZ015;007;
 KFAR;;US_ND;Fargo;NDZ039;;
 KGFK;;US_ND;Grand Forks;NDZ027;007;
 KISN;;US_ND;Williston;NDZ009;006;
-KJMS;;US_ND;Jamestown;NDZ037;016;
+KJMS;;US_ND;Jamestown Municipal Airport;NDZ037;016;
 KMIB;;US_ND;Minot AFB;NDZ011;007;
 KMOT;;US_ND;Minot;NDZ011;007;
 KP11;;US_ND;Devils Lake (2);NDZ015;007;
@@ -3845,23 +3845,23 @@ KEAR;;US_NE;Kearney;NEZ061;;
 KFNB;;US_NE;Falls City;NEZ093;057;
 KGRI;;US_NE;Grand Island;NEZ062;056;
 KHSI;;US_NE;Hastings;NEZ075;056;
-KIML;;US_NE;Imperial;NEZ069;055;
+KIML;;US_NE;Imperial Municipal Airport;NEZ069;055;
 KLBF;;US_NE;North Platte;NEZ059;;
 KLNK;;US_NE;Lincoln;NEZ066;057;
 KMCK;;US_NE;McCook;NEZ081;056;
 KMHN;;US_NE;Mullen;NEZ007;042;
 KODX;;US_NE;Ord-Sharp;NEZ039;;
 KOFF;;US_NE;Omaha-Bellevue;NEZ052;057;
-KOFK;;US_NE;Norfolk;NEZ031;042;
-KOLU;;US_NE;Columbus;NEZ042;;
+KOFK;;US_NE;Karl Stefan Memorial Airport;NEZ031;042;
+KOLU;;US_NE;Columbus Municipal Airport;NEZ042;;
 KOMA;;US_NE;Omaha;NEZ052;057;
 KONL;;US_NE;O'Neill;NEZ010;042;
-KSNY;;US_NE;Sidney;NEZ055;055;
+KSNY;;US_NE;Sidney Municipal Airport;NEZ055;055;
 KVTN;;US_NE;Valentine;NEZ005;042;
 KAFN;;US_NH;Jaffrey;NHZ011;;
 KASH;;US_NH;Nashua;NHZ012;;
 KBML;;US_NH;Berlin;NHZ002;034;
-KCON;;US_NH;Concord;NHZ008;049;
+KCON;;US_NH;Concord Municipal Airport;NHZ008;049;
 KEEN;;US_NH;Keene;NHZ011;049;
 KHIE;;US_NH;MT WASHINGTON REGIONAL AIRPORT ;;;
 KLCI;;US_NH;Laconia;NHZ009;049;
@@ -3886,7 +3886,7 @@ K4MY;;US_NM;Moriarty;NMZ011;;
 K4SL;;US_NM;Cuba Awrs;NMZ002;;
 KABQ;;US_NM;Albuquerque;NMZ009;abq;
 KCAO;;US_NM;Clayton;NMZ007;;
-KCNM;;US_NM;Carlsbad;NMZ028;;
+KCNM;;US_NM;Carlsbad Cavern City;NMZ028;;
 KCVS;;US_NM;Clovis-Cannon AFB;NMZ021;;
 KFMN;;US_NM;Farmington;NMZ001;081;
 KGNT;;US_NM;Grants;NMZ008;093;
@@ -3894,7 +3894,7 @@ KGUP;;US_NM;Gallup;NMZ008;093;
 KHMN;;US_NM;Alamogordo;NMZ024;;
 KHOB;;US_NM;Hobbs;NMZ029;;
 KLAM;;US_NM;Los Alamos;NMZ002;081;
-KLVS;;US_NM;Las Vegas;NMZ005;abq;
+KLVS;;US_NM;Las Vegas Municipal Airport;NMZ005;abq;
 KONM;;US_NM;Socorro;NMZ015;;
 KROW;;US_NM;Roswell;NMZ019;;
 KSAF;;US_NM;Santa Fe;NMZ011;abq;
@@ -3903,21 +3903,21 @@ KTCC;;US_NM;Tucumcari;NMZ013;;
 KTCS;;US_NM;Truth or Consequences;NMZ023;;
 KDRA;;US_NV;DESERT ROCK AIRPORT;;;
 KEKO;;US_NV;Elko;NVZ008;;
-KELY;;US_NV;Ely;NVZ011;;
-KHTH;;US_NV;Hawthorne;NVZ001;;
-KLAS;;US_NV;Las Vegas;NVZ020;079;
+KELY;;US_NV;Ely (Yelland Field);NVZ011;;
+KHTH;;US_NV;Hawthorne Municipal Airport 2;NVZ001;;
+KLAS;;US_NV;Las Vegas MCCARRAN INT;NVZ020;079;
 KLOL;;US_NV;Lovelock;NVZ004;;
 KLSV;;US_NV;N Las Vegas;NVZ020;079;
 KNFL;;US_NV;Fallon;NVZ004;;
 KOWY;;US_NV;Owyhee;NVZ007;;
 KP38;;US_NV;Caliente;NVZ015;;
-KP68;;US_NV;Eureka;NVZ012;;
+KP68;;US_NV;Eureka (US);NVZ012;;
 KRNO;;US_NV;Reno;NVZ003;065;
 KTPH;;US_NV;Tonopah;NVZ014;;
 KU31;;US_NV;Austin;NVZ012;;
 KWMC;;US_NV;Winnemucca;NVZ006;;
-KALB;;US_NY;Albany;NYZ052;048;
-KART;;US_NY;Watertown;NYZ007;;
+KALB;;US_NY;Albany INT;NYZ052;048;
+KART;;US_NY;Watertown INT;NYZ007;;
 KBGM;;US_NY;Binghamton;NYZ056;;
 KBUF;;US_NY;Buffalo;NYZ010;047;
 KELM;;US_NY;Elmira;NYZ024;;
@@ -3930,17 +3930,17 @@ KIAG;;US_NY;Niagara Falls;NYZ001;047;
 KISP;;US_NY;Islip;NYZ080;;
 KITH;;US_NY;Ithaca;NYZ025;048;
 KJFK;;US_NY;New York-JFK Arpt;NYZ076;lga;
-KJHW;;US_NY;Jamestown;NYZ019;047;
+KJHW;;US_NY;Jamestown Chautauqua County;NYZ019;047;
 KLGA;;US_NY;New York-La Guardia;NYZ076;lga;
-KMGJ;;US_NY;Montgomery;NYZ067;;
+KMGJ;;US_NY;Montgomery Orange Co Airport;NYZ067;;
 KMSS;;US_NY;Massena;NYZ026;;
-KMSV;;US_NY;Monticello;NYZ062;;
+KMSV;;US_NY;Monticello Sullivan County International;NYZ062;;
 KOGS;;US_NY;Ogdensburg;NYZ026;;
 KPBG;;US_NY;Plattsburg;NYZ031;;
-KPEO;;US_NY;PENN YAN AIRPORT;;;
+KPEO;;US_NY;Penn Yan Airport;;;
 KPOU;;US_NY;Poughkeepsie;NYZ065;;
-KRME;;US_NY;GRIFFISS AIRFIELD;;;
-KROC;;US_NY;Rochester;NYZ003;047;
+KRME;;US_NY;Griffiss Airfield;;;
+KROC;;US_NY;Rochester Greater INT;NYZ003;047;
 KSCH;;US_NY;Schenectady;NYZ049;;
 KSLK;;US_NY;Saranac Lake;NYZ027;;
 KSWF;;US_NY;Newburgh;NYZ067;;
@@ -3948,7 +3948,7 @@ KSYR;;US_NY;Syracuse;NYZ018;048;
 KUCA;;US_NY;Utica;NYZ037;;
 KBJJ;;US_OH;Wooster;OHZ031;;
 KBKL;;US_OH;Cleveland-Lakefront;OHZ011;cle;
-KCAK;;US_OH;Akron;OHZ021;;
+KCAK;;US_OH;Akron-Canton Regional Airport;OHZ021;;
 KCGF;;US_OH;Cleveland/Cuyahoga;OHZ011;cle;
 KCLE;;US_OH;Cleveland;OHZ011;cle;
 KCMH;;US_OH;Columbus-Gahanna;OHZ055;;
@@ -3956,20 +3956,20 @@ KDAY;;US_OH;Dayton;OHZ061;074;
 KFDY;;US_OH;Findlay;OHZ017;;
 KFFO;;US_OH;Dayton-Fairborn;OHZ061;;
 KHAO;;US_OH;Hamilton;OHZ070;;
-KILN;;US_OH;Wilmington;OHZ072;;
+KILN;;US_OH;Wilmington Industrial Airport;OHZ072;;
 KLCK;;US_OH;Rickenbacker;OHZ070;;
-KLHQ;;US_OH;Lancaster;OHZ067;;
+KLHQ;;US_OH;Lancaster Fairfield Co;OHZ067;;
 KLNN;;US_OH;Willoughby;OHZ012;;
 KLUK;;US_OH;Cincinnati;OHZ077;074;
 KMFD;;US_OH;Mansfield;OHZ029;;
 KMGY;;US_OH;Dayton-South Airport;OHZ061;;
 KOSU;;US_OH;Columbus-OSU;OHZ055;;
-KTOL;;US_OH;Toledo;OHZ003;;
+KTOL;;US_OH;Toledo Express Airport;OHZ003;;
 KYNG;;US_OH;Youngstown;OHZ033;;
 KZZV;;US_OH;Zanesville;OHZ057;;
 KADM;;US_OK;Ardmore;OKZ046;;
 KBVO;;US_OK;Bartlesville;OKZ054;084;
-KCSM;;US_OK;Clinton;OKZ016;;
+KCSM;;US_OK;Clinton-Sherman Airport;OKZ016;;
 KEND;;US_OK;Enid;OKZ012;;
 KFSI;;US_OK;Fort Sill;OKZ038;;
 KGAG;;US_OK;Gage;OKZ009;;
@@ -3985,7 +3985,7 @@ KSWO;;US_OK;Stillwater;OKZ020;084;
 KTIK;;US_OK;Oklahoma City-Midwest City;OKZ025;095;
 KTUL;;US_OK;Tulsa;OKZ060;084;
 KWDG;;US_OK;Enid/Woodring;OKZ012;084;
-K3S2;;US_OR;Aurora;ORZ005;;
+K3S2;;US_OR;Aurora State;ORZ005;;
 K4BK;;US_OR;Brookings;ORZ003;;
 K4LW;;US_OR;Lakeview;ORZ015;;
 KAST;;US_OR;Astoria;ORZ001;;
@@ -3998,14 +3998,14 @@ KHIO;;US_OR;Hillsboro;ORZ004;;
 KLMT;;US_OR;Klamath Falls;ORZ012;;
 KMEH;;US_OR;Meacham;ORZ017;;
 KMFR;;US_OR;Medford;ORZ008;;
-KONO;;US_OR;Ontario;ORZ021;;
+KONO;;US_OR;Ontario Municipal Airport;ORZ021;;
 KONP;;US_OR;Newport;ORZ002;;
 KOTH;;US_OR;North Bend;ORZ003;;
 KPDT;;US_OR;Pendleton;ORZ017;;
-KPDX;;US_OR;Portland;ORZ004;;
+KPDX;;US_OR;Portland INT;ORZ004;;
 KRBG;;US_OR;Roseburg;ORZ007;;
 KRDM;;US_OR;Redmond;ORZ014;;
-KSLE;;US_OR;Salem;ORZ005;;
+KSLE;;US_OR;Salem McNary Field;ORZ005;;
 KSXT;;US_OR;Sexton Summit;ORZ008;;
 KTTD;;US_OR;Troutdale;ORZ004;;
 KABE;;US_PA;Allentown;PAZ061;062;
@@ -4016,7 +4016,7 @@ KBFD;;US_PA;Bradford;PAZ005;047;
 KCXY;;US_PA;Harrisburg;PAZ057;062;
 KDUJ;;US_PA;Du Bois;PAZ017;061;
 KERI;;US_PA;Erie;PAZ002;047;
-KFKL;;US_PA;Franklin;PAZ008;061;
+KFKL;;US_PA;Franklin Venango Regional;PAZ008;061;
 KIPT;;US_PA;Williamsport;PAZ046;062;
 KJST;;US_PA;Johnstown;PAZ024;pit;
 KLBE;;US_PA;Latrobe;PAZ030;pit;
@@ -4033,11 +4033,11 @@ KOQU;;US_RI;North Kingstown;RIZ006;;
 KPVD;;US_RI;Providence;RIZ002;bos;
 K2PJ;;US_SC;Sumter (2);SCZ031;;
 KAND;;US_SC;Anderson;SCZ010;099;
-KCAE;;US_SC;Columbia;SCZ028;100;
-KCHS;;US_SC;Charleston;SCZ050;;
+KCAE;;US_SC;Columbia Metropolitain Airport;SCZ028;100;
+KCHS;;US_SC;Charleston INT;SCZ050;;
 KCRE;;US_SC;N Myrtle Beach;SCZ034;;
 KFLO;;US_SC;Florence;SCZ032;;
-KGMU;;US_SC;Greenville;SCZ006;099;
+KGMU;;US_SC;Greenville Downtown Airport;SCZ006;099;
 KGSP;;US_SC;Greenville-Spartanburg;SCZ007;099;
 KMMT;;US_SC;Columbia-McEntire;SCZ028;100;
 KMYR;;US_SC;Myrtle Beach;SCZ034;;
@@ -4046,8 +4046,8 @@ KSSC;;US_SC;Sumter;SCZ031;;
 K0V1;;US_SD;Custer;SDZ029;;
 K9V9;;US_SD;Chamberlain;SDZ057;;
 KABR;;US_SD;Aberdeen;SDZ006;;
-KATY;;US_SD;Watertown;SDZ020;;
-KBKX;;US_SD;Brookings;SDZ040;;
+KATY;;US_SD;Watertown Municipal Airport;SDZ020;;
+KBKX;;US_SD;Brookings Municipal Airport;SDZ040;;
 KFSD;;US_SD;Sioux Falls;SDZ062;043;
 KHON;;US_SD;Huron;SDZ038;028;
 KMHE;;US_SD;Mitchell;SDZ059;028;
@@ -4063,18 +4063,18 @@ KCSV;;US_TN;Crossville;TNZ066;;
 KDKX;;US_TN;Knoxville-Downtown;TNZ069;087;
 KDYR;;US_TN;Dyersburg;TNZ019;;
 KMEM;;US_TN;Memphis;TNZ088;097;
-KMKL;;US_TN;Jackson;TNZ052;;
+KMKL;;US_TN;Jackson MCKELLAR-SIPES RGNL;TNZ052;;
 KMQY;;US_TN;Smyrna;TNZ062;;
 KNQA;;US_TN;Memphis-NAS;TNZ088;097;
 KTRI;;US_TN;Bristol;TNZ017;;
-KTYS;;US_TN;Knoxville;TNZ069;087;
+KTYS;;US_TN;McGhee Tyson Airport;TNZ069;087;
 KABI;;US_TX;Abilene;TXZ127;;
 KACT;;US_TX;Waco;TXZ159;;
 KADS;;US_TX;Dallas-Addison;TXZ119;;
 KAFW;;US_TX;Fort Worth-Alliance;TXZ118;;
 KALI;;US_TX;Alice;TXZ241;;
 KAMA;;US_TX;Amarillo;TXZ017;;
-KAUS;;US_TX;Austin;TXZ192;113;
+KAUS;;US_TX;Austin INT;TXZ192;113;
 KBGD;;US_TX;Borger;TXZ008;;
 KBMQ;;US_TX;BURNET MUNICIPAL CRADDOCK FIELD;;;
 KBPT;;US_TX;Beaumont-Port Arthur;TXZ215;;
@@ -4164,14 +4164,14 @@ KAKQ;;US_VA;Wakefield;VAZ088;;
 KBCB;;US_VA;Virginia Tech Airport;VAZ014;;
 KCHO;;US_VA;Charlottesville;VAZ037;;
 KDAA;;US_VA;Fort Belvoir;VAZ053;;
-KDAN;;US_VA;Danville;VAZ044;;
+KDAN;;US_VA;Danville Regional Airport;VAZ044;;
 KEZF;;US_VA;Fredericksburg, Shannon Airport;;;
 KFAF;;US_VA;Fort Eustis / Felker;;;
-KFKN;;US_VA;Franklin;VAZ092;;
+KFKN;;US_VA;Franklin/J B Rose;VAZ092;;
 KFVX;;US_VA;Farmville;VAZ061;;
 KHEF;;US_VA;Manassas;VAZ052;;
 KHLX;;US_VA;Galax-Hillsville;VAZ016;;
-KHSP;;US_VA;Hot Springs;VAZ020;;
+KHSP;;US_VA;Hot Springs/Ingalls;VAZ020;;
 KJYO;;US_VA;Leesburg;VAZ042;;
 KLFI;;US_VA;Langley AFB;VAZ094;;
 KLNP;;US_VA;Wise;VAZ002;;
@@ -4184,22 +4184,22 @@ KNTU;;US_VA;Virginia Beach;VAZ098;;
 KNYG;;US_VA;Quantico;VAZ052;;
 KOFP;;US_VA;Ashland;VAZ063;;
 KOKV;;US_VA;Winchester;VAZ028;;
-KORF;;US_VA;Norfolk;VAZ093;089;
+KORF;;US_VA;Norfolk INT;VAZ093;089;
 KPHF;;US_VA;Newport News;VAZ093;;
 KPSK;;US_VA;Dublin;VAZ013;;
-KPTB;;US_VA;Petersburg;VAZ081;;
+KPTB;;US_VA;Petersburg Dinwiddie County;VAZ081;;
 KRIC;;US_VA;Richmond;VAZ071;089;
 KROA;;US_VA;Roanoke;VAZ022;;
 KSHD;;US_VA;Waynesboro;VAZ025;;
 KVJI;;US_VA;Abingdon;VAZ008;;
 KWAL;;US_VA;WALLOPS FLIGHT FAC AIRPORT ;;;
 K9B2;;US_VT;St Johnsbury;VTZ007;;
-KBTV;;US_VT;Burlington;VTZ005;;
+KBTV;;US_VT;Burlington INT;VTZ005;;
 KMPV;;US_VT;Montpelier;VTZ008;034;
 KRUT;;US_VT;Rutland;VTZ011;;
-KVSF;;US_VT;Springfield;VTZ012;;
+KVSF;;US_VT;Hartness State Airport;VTZ012;;
 K4OM;;US_WA;Omak;WAZ038;;
-K75S;;US_WA;Burlington;WAZ005;;
+K75S;;US_WA;Burlington / Mt Vern;WAZ005;;
 K76S;;US_WA;Oak Harbor;WAZ009;;
 KALW;;US_WA;Walla Walla;WAZ029;;
 KBFI;;US_WA;Seattle-Boeing;WAZ007;sea;
@@ -4225,7 +4225,7 @@ KSHN;;US_WA;Shelton;WAZ010;;
 KSKA;;US_WA;Fairchild Air Force Base;;;
 KSMP;;US_WA;STAMPEDE PASS;;;
 KTCM;;US_WA;Tacoma-Lakewood;WAZ007;sea;
-KTDO;;US_WA;Toledo;WAZ020;;
+KTDO;;US_WA;Toledo-Winlock Memorial;WAZ020;;
 KTIW;;US_WA;Tacoma;WAZ007;sea;
 KUIL;;US_WA;QUILLAYUTE STATE AIRPORT;;;
 KYKM;;US_WA;Yakima;WAZ025;;
@@ -4238,7 +4238,7 @@ KEAU;;US_WI;Eau Claire;WIZ028;;
 KENW;;US_WI;Kenosha;WIZ072;;
 KFLD;;US_WI;Fond Du Lac;WIZ051;;
 KGRB;;US_WI;Green Bay;WIZ039;;
-KHYR;;US_WI;Hayward;WIZ008;;
+KHYR;;US_WI;Hayward Municipal Airport;WIZ008;;
 KISW;;US_WI;Wisconsin Rapids;WIZ035;;
 KJVL;;US_WI;Janesville;WIZ069;;
 KLNR;;US_WI;Lone Rock;WIZ055;;
@@ -4259,7 +4259,7 @@ KVOK;;US_WI;Volk / Camp Douglas;;;
 KBKW;;US_WV;Beckley;WVZ035;;
 KBLF;;US_WV;Bluefield;WVZ042;;
 KCKB;;US_WV;Clarksburg;WVZ031;;
-KCRW;;US_WV;Charleston;WVZ015;074;
+KCRW;;US_WV;Charleston Yeager Airport;WVZ015;074;
 KEKN;;US_WV;Elkins;WVZ047;;
 KHLG;;US_WV;Wheeling;WVZ004;;
 KHTS;;US_WV;Huntington;WVZ006;;
@@ -4275,7 +4275,7 @@ KCPR;;US_WY;Casper;WYZ064;;
 KCYS;;US_WY;Cheyenne;WYZ069;;
 KEVW;;US_WY;Evanston;WYZ021;;
 KGCC;;US_WY;Gillette;WYZ054;026;
-KJAC;;US_WY;Jackson;WYZ006;;
+KJAC;;US_WY;Jackson Hole Airport;WYZ006;;
 KLAR;;US_WY;Laramie;WYZ066;;
 KLND;;US_WY;Lander;WYZ012;040;
 KP60;;US_WY;Yellowstone;WYZ001;;