diff --git a/ATIS/ATIS Soundfiles/MarianaIslands/Antonio B. Won Pat International Airport.ogg b/ATIS/ATIS Soundfiles/MarianaIslands/Antonio B. Won Pat Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/MarianaIslands/Antonio B. Won Pat International Airport.ogg
rename to ATIS/ATIS Soundfiles/MarianaIslands/Antonio B. Won Pat Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/MarianaIslands/Northwest_Field.ogg b/ATIS/ATIS Soundfiles/MarianaIslands/North West Field.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/MarianaIslands/Northwest_Field.ogg
rename to ATIS/ATIS Soundfiles/MarianaIslands/North West Field.ogg
diff --git a/ATIS/ATIS Soundfiles/MarianaIslands/Rota International Airport.ogg b/ATIS/ATIS Soundfiles/MarianaIslands/Rota Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/MarianaIslands/Rota International Airport.ogg
rename to ATIS/ATIS Soundfiles/MarianaIslands/Rota Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/MarianaIslands/Saipan International Airport.ogg b/ATIS/ATIS Soundfiles/MarianaIslands/Saipan Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/MarianaIslands/Saipan International Airport.ogg
rename to ATIS/ATIS Soundfiles/MarianaIslands/Saipan Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/MarianaIslands/Tinian International Airport.ogg b/ATIS/ATIS Soundfiles/MarianaIslands/Tinian Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/MarianaIslands/Tinian International Airport.ogg
rename to ATIS/ATIS Soundfiles/MarianaIslands/Tinian Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Beatty Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Beatty.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Beatty Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Beatty.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Boulder City Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Boulder City.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Boulder City Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Boulder City.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Creech AFB.ogg b/ATIS/ATIS Soundfiles/Nevada/Creech.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Creech AFB.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Creech.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Groom Lake AFB.ogg b/ATIS/ATIS Soundfiles/Nevada/Groom Lake.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Groom Lake AFB.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Groom Lake.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Henderson Executive Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Henderson Executive.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Henderson Executive Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Henderson Executive.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Jean Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Jean.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Jean Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Jean.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Laughlin Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Laughlin.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Laughlin Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Laughlin.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/McCarran International Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/McCarran International.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/McCarran International Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/McCarran International.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Mina Airport 3Q0.ogg b/ATIS/ATIS Soundfiles/Nevada/Mina.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Mina Airport 3Q0.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Mina.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Nellis AFB.ogg b/ATIS/ATIS Soundfiles/Nevada/Nellis.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Nellis AFB.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Nellis.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Pahute Mesa Airstrip.ogg b/ATIS/ATIS Soundfiles/Nevada/Pahute Mesa.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Pahute Mesa Airstrip.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Pahute Mesa.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Tonopah Test Range Airfield.ogg b/ATIS/ATIS Soundfiles/Nevada/Tonopah Test Range.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Tonopah Test Range Airfield.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Tonopah Test Range.ogg
diff --git a/ATIS/ATIS Soundfiles/Nevada/Tonopah Airport.ogg b/ATIS/ATIS Soundfiles/Nevada/Tonopah.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/Nevada/Tonopah Airport.ogg
rename to ATIS/ATIS Soundfiles/Nevada/Tonopah.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Abu Dhabi International Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Abu Dhabi Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Abu Dhabi International Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Abu Dhabi Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Abu Musa Island Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Abu Musa Island.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Abu Musa Island Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Abu Musa Island.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Al Ain International Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Al Ain Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Al Ain International Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Al Ain Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Al Dhafra AB.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Al Dhafra AFB.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Al Dhafra AB.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Al Dhafra AFB.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Al Minhad AB.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Al Minhad AFB.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Al Minhad AB.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Al Minhad AFB.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Al-Bateen Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Al-Bateen.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Al-Bateen Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Al-Bateen.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Bandar-e-Jask airfield.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Bandar-e-Jask.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Bandar-e-Jask airfield.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Bandar-e-Jask.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Jiroft Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Jiroft.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Jiroft Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Jiroft.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Kerman Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Kerman.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Kerman Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Kerman.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Kish International Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Kish Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Kish International Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Kish Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Lar Airbase.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Lar.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Lar Airbase.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Lar.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Lavan Island Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Lavan Island.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Lavan Island Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Lavan Island.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Liwa Airbase.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Liwa AFB.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Liwa Airbase.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Liwa AFB.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Ras Al Khaimah International Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Ras Al Khaimah Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Ras Al Khaimah International Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Ras Al Khaimah Intl.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Sas Al Nakheel Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Sas Al Nakheel.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Sas Al Nakheel Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Sas Al Nakheel.ogg
diff --git a/ATIS/ATIS Soundfiles/PersianGulf/Shiraz International Airport.ogg b/ATIS/ATIS Soundfiles/PersianGulf/Shiraz Intl.ogg
similarity index 100%
rename from ATIS/ATIS Soundfiles/PersianGulf/Shiraz International Airport.ogg
rename to ATIS/ATIS Soundfiles/PersianGulf/Shiraz Intl.ogg