diff --git a/sites/directv.com.uy/directv.com.uy.channels.xml b/sites/directv.com.uy/directv.com.uy.channels.xml
index a47d2e16..01869235 100644
--- a/sites/directv.com.uy/directv.com.uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="es" xmltv_id="BBCWorldNewsLatinAmerica.uk" site_id="768#BBC">BBC World News</channel>
     <channel lang="es" xmltv_id="BloombergTV.us" site_id="710#BTV">Bloomberg Television</channel>
     <channel lang="es" xmltv_id="Canal4.uy" site_id="190#CAN4HD">Canal 4 (URU)</channel>
-    <channel lang="es" xmltv_id="TVNacionalUruguay.uy" site_id="191#CAN5">Canal 5 (URU)</channel>
+    <channel lang="es" xmltv_id="Canal5.uy" site_id="191#CAN5">Canal 5 (URU)</channel>
   	<channel lang="es" xmltv_id="Teledoce.uy" site_id="1192#CN12HD">Canal 12 (URU)</channel>
     <channel lang="es" xmltv_id="Canal10.uy" site_id="1193#CN10HD">Canal 10 (URU)</channel>
     <channel lang="es" xmltv_id="Cablenoticias.co" site_id="727#CNOT">Cable Noticias de Colombia</channel>
diff --git a/sites/directv.com/directv.com.channels.xml b/sites/directv.com/directv.com.channels.xml
index cd9122c4..40290cc7 100644
--- a/sites/directv.com/directv.com.channels.xml
+++ b/sites/directv.com/directv.com.channels.xml
@@ -22,8 +22,8 @@
     <channel lang="en" xmltv_id="AMCEast.us" site_id="254#254">AMC</channel>
     <!-- <channel lang="en" xmltv_id="AMCEast.us" site_id="254#4217">AMC HD</channel> -->
     <channel lang="en" xmltv_id="AMCPlus.us" site_id="557#6709">AMC+ HD</channel>
-    <channel lang="en" xmltv_id="AmericanHeroesChannelUSA.us" site_id="287#287">American Heroes Channel</channel>
-    <!-- <channel lang="en" xmltv_id="AmericanHeroesChannelUSA.us" site_id="287#288">American Heroes HD</channel> -->
+    <channel lang="en" xmltv_id="AmericanHeroesChannel.us" site_id="287#287">American Heroes Channel</channel>
+    <!-- <channel lang="en" xmltv_id="AmericanHeroesChannel.us" site_id="287#288">American Heroes HD</channel> -->
     <!-- <channel lang="en" xmltv_id="???" site_id="2070#4512">ANC (99R)</channel> -->
     <channel lang="en" xmltv_id="AnimalPlanetEast.us" site_id="282#282">Animal Planet</channel>
     <!-- <channel lang="en" xmltv_id="AnimalPlanetEast.us" site_id="282#8205">Animal Planet HD</channel> -->
@@ -366,7 +366,7 @@
     <channel lang="es" xmltv_id="GodTV.uk" site_id="365#1579">God TV</channel>
     <channel lang="en" xmltv_id="GolfChannel.us" site_id="218#605">Golf Channel</channel>
     <!-- <channel lang="en" xmltv_id="GolfChannel.us" site_id="218#5605">Golf Channel HD</channel> -->
-    <channel lang="en" xmltv_id="GolTV.us" site_id="468#3641">GolTV</channel>
+    <channel lang="en" xmltv_id="GolTVUSA.us" site_id="468#3641">GolTV</channel>
     <channel lang="en" xmltv_id="GreatAmericanCountry.us" site_id="326#326">Great American Family</channel>
     <!-- <channel lang="en" xmltv_id="GreatAmericanCountry.us" site_id="326#573">Great American Family HD</channel> -->
     <channel lang="en" xmltv_id="Grit.us" site_id="81#6172">GRIT</channel>
diff --git a/sites/flixed.io/flixed.io.channels.xml b/sites/flixed.io/flixed.io.channels.xml
index bfafdabc..7d4161a8 100644
--- a/sites/flixed.io/flixed.io.channels.xml
+++ b/sites/flixed.io/flixed.io.channels.xml
@@ -20,8 +20,8 @@
     <channel lang="en" xmltv_id="AMCWest.us" site_id="31556">AMC (West)</channel>
     <!-- <channel lang="en" xmltv_id="AMCEast.us" site_id="59337">AMC HD</channel> -->
     <!-- <channel lang="en" xmltv_id="AMCEast.us" site_id="92022">AMC Stream East</channel> -->
-    <channel lang="en" xmltv_id="AmericanHeroesChannelUSA.us" site_id="18284">American Heroes Channel</channel>
-    <!-- <channel lang="en" xmltv_id="AmericanHeroesChannelUSA.us" site_id="78808">American Heroes Channel HD</channel> -->
+    <channel lang="en" xmltv_id="AmericanHeroesChannel.us" site_id="18284">American Heroes Channel</channel>
+    <!-- <channel lang="en" xmltv_id="AmericanHeroesChannel.us" site_id="78808">American Heroes Channel HD</channel> -->
     <channel lang="en" xmltv_id="AnimalPlanetEast.us" site_id="16331">Animal Planet</channel>
     <!-- <channel lang="en" xmltv_id="AnimalPlanetEast.us" site_id="57394">Animal Planet HD</channel> -->
     <channel lang="en" xmltv_id="AntennaTV.us" site_id="70248">Antenna TV</channel>
@@ -206,7 +206,7 @@
     <channel lang="en" xmltv_id="GINXEsportsTVCanada.ca" site_id="96537">GINX eSports TV US</channel>
     <channel lang="en" xmltv_id="GolfChannel.us" site_id="14899">Golf Channel</channel>
     <!-- <channel lang="en" xmltv_id="GolfChannel.us" site_id="61854">Golf Channel HD</channel> -->
-    <channel lang="en" xmltv_id="GolTV.us" site_id="69101">GOLTV (English) HD</channel>
+    <channel lang="en" xmltv_id="GolTVUSA.us" site_id="69101">GOLTV (English) HD</channel>
     <channel lang="es" xmltv_id="GolTVLatinAmerica.us" site_id="68608">GOLTV International HD</channel>
     <channel lang="en" xmltv_id="HallmarkChannelEast.us" site_id="11221">Hallmark Channel (East)</channel>
     <channel lang="en" xmltv_id="HallmarkChannelWest.us" site_id="19933">Hallmark Channel (West)</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
index c6525387..869b0ab3 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
@@ -128,15 +128,15 @@
     <channel lang="de" xmltv_id="SAT1.de" site_id="322">Sat. 1 Deutschland</channel>
     <channel lang="en" xmltv_id="SkyNews.uk" site_id="231">Sky News UK</channel>
     <channel lang="de" xmltv_id="Sport1.de" site_id="309">Sport 1</channel>
-    <channel lang="hr" xmltv_id="SportKlub1.rs" site_id="447">Sport Klub 1 Hrvatska</channel>
-    <channel lang="hr" xmltv_id="SportKlub2.rs" site_id="448">Sport Klub 2 Srbija</channel>
-    <channel lang="hr" xmltv_id="SportKlub3.rs" site_id="221">Sport Klub 3</channel>
-    <channel lang="hr" xmltv_id="SportKlub4.rs" site_id="222">Sport Klub 4</channel>
-    <channel lang="hr" xmltv_id="SportKlub5.rs" site_id="223">Sport Klub 5</channel>
-    <channel lang="hr" xmltv_id="SportKlub6.rs" site_id="224">Sport Klub 6</channel>
-    <channel lang="hr" xmltv_id="SportKlubEsports.rs" site_id="751">Sport Klub Esports</channel>
-    <channel lang="hr" xmltv_id="SportKlubGolf.rs" site_id="313">Sport Klub Golf</channel>
-    <channel lang="hr" xmltv_id="SportKlubStart.rs" site_id="308">Sport Klub Start</channel>
+    <channel lang="hr" xmltv_id="SportKlub1Croatia.hr" site_id="447">Sport Klub 1 Hrvatska</channel>
+    <channel lang="hr" xmltv_id="SportKlub2Serbia.rs" site_id="448">Sport Klub 2 Srbija</channel>
+    <!-- <channel lang="hr" xmltv_id="" site_id="221">Sport Klub 3</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="222">Sport Klub 4</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="223">Sport Klub 5</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="224">Sport Klub 6</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="751">Sport Klub Esports</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="313">Sport Klub Golf</channel> -->
+    <!-- <channel lang="hr" xmltv_id="" site_id="308">Sport Klub Start</channel> -->
     <channel lang="hr" xmltv_id="SportskaTV.hr" site_id="96">Sportska TV</channel>
     <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="299">Stingray Classica</channel>
     <channel lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="267">Stingray Djazz</channel>
diff --git a/sites/maxtvgo.mk/maxtvgo.mk.channels.xml b/sites/maxtvgo.mk/maxtvgo.mk.channels.xml
index b0c1133b..a01ce968 100644
--- a/sites/maxtvgo.mk/maxtvgo.mk.channels.xml
+++ b/sites/maxtvgo.mk/maxtvgo.mk.channels.xml
@@ -4,15 +4,15 @@
     <channel lang="mk" xmltv_id="AlfaTV.mk" site_id="28">Alfa TV</channel>
     <channel lang="mk" xmltv_id="AlJazeeraBalkans.ba" site_id="127">Aljazeera Balkans</channel>
     <channel lang="mk" xmltv_id="Alsat.mk" site_id="68">Alsat-M</channel>
-    <channel lang="mk" xmltv_id="ArenaFight.rs" site_id="3671498">Arena Fight</channel>
-    <channel lang="mk" xmltv_id="ArenaPremium1.rs" site_id="3652505">Arena Premium 1</channel>
-    <channel lang="mk" xmltv_id="ArenaPremium2.rs" site_id="3652489">Arena Premium 2</channel>
-    <channel lang="mk" xmltv_id="ArenaPremium3.rs" site_id="3652529">Arena Premium 3</channel>
-    <channel lang="mk" xmltv_id="ArenaSport1.rs" site_id="27">Arena Sport 1</channel>
-    <channel lang="mk" xmltv_id="ArenaSport2.rs" site_id="79">Arena Sport 2</channel>
-    <channel lang="mk" xmltv_id="ArenaSport3.rs" site_id="60">Arena Sport 3</channel>
-    <channel lang="mk" xmltv_id="ArenaSport4.rs" site_id="100">Arena Sport 4</channel>
-    <channel lang="mk" xmltv_id="ArenaSport5.rs" site_id="2145177">Arena Sport 5</channel>
+    <channel lang="mk" xmltv_id="ArenaFightSerbia.rs" site_id="3671498">Arena Fight</channel>
+    <channel lang="mk" xmltv_id="ArenaSport1PremiumSerbia.rs" site_id="3652505">Arena Premium 1</channel>
+    <channel lang="mk" xmltv_id="ArenaSport2PremiumSerbia.rs" site_id="3652489">Arena Premium 2</channel>
+    <channel lang="mk" xmltv_id="ArenaSport3PremiumSerbia.rs" site_id="3652529">Arena Premium 3</channel>
+    <channel lang="mk" xmltv_id="ArenaSport1Serbia.rs" site_id="27">Arena Sport 1</channel>
+    <channel lang="mk" xmltv_id="ArenaSport2Serbia.rs" site_id="79">Arena Sport 2</channel>
+    <channel lang="mk" xmltv_id="ArenaSport3Serbia.rs" site_id="60">Arena Sport 3</channel>
+    <channel lang="mk" xmltv_id="ArenaSport4Serbia.rs" site_id="100">Arena Sport 4</channel>
+    <channel lang="mk" xmltv_id="ArenaSport5Serbia.rs" site_id="2145177">Arena Sport 5</channel>
     <channel lang="mk" xmltv_id="BalkanikaMusicTV.bg" site_id="24">Balkanika Music TV</channel>
     <channel lang="mk" xmltv_id="BalkanMusicTV.mk" site_id="3186681">Balkan Music TV</channel>
     <channel lang="mk" xmltv_id="DaVinci.de" site_id="103">Da Vinci</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index 5b2623fa..0f82f6cc 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -74,7 +74,7 @@
     <channel lang="es" xmltv_id="GoldenEdgePanregional.mx" site_id="ar#golden-edge">Golden Edge</channel>
     <channel lang="es" xmltv_id="GoldenPanregional.mx" site_id="ar#golden">Golden</channel>
     <channel lang="es" xmltv_id="GolfChannelLatinAmerica.us" site_id="ar#golf-channel">Golf Channel</channel>
-    <channel lang="es" xmltv_id="GolTV.us" site_id="ar#gol-tv">Gol TV</channel>
+    <channel lang="es" xmltv_id="GolTVUSA.us" site_id="ar#gol-tv">Gol TV</channel>
     <channel lang="es" xmltv_id="HAPSATV.ar" site_id="ar#hapsa">HAPSATV</channel>
     <channel lang="es" xmltv_id="HBO2LatinAmerica.us" site_id="ar#hbo-2">HBO 2</channel>
     <channel lang="es" xmltv_id="HBOFamilyLatinAmerica.us" site_id="ar#hbo-family">HBO Family</channel>
@@ -148,7 +148,7 @@
     <channel lang="es" xmltv_id="TVCortos.us" site_id="ar#tv-cortos">TV Cortos</channel>
     <channel lang="es" xmltv_id="TVEInternacionalAmerica.es" site_id="ar#tve">TVE</channel>
     <channel lang="es" xmltv_id="TVGloboInternacionalAmericas.br" site_id="ar#tv-globo">TV Globo</channel>
-    <channel lang="es" xmltv_id="TVNacionalUruguay.uy" site_id="ar#tv-nacional-uruguay">TV Nacional Uruguay</channel>
+    <channel lang="es" xmltv_id="Canal5.uy" site_id="ar#tv-nacional-uruguay">TV Nacional Uruguay</channel>
     <channel lang="es" xmltv_id="TVPublica.ar" site_id="ar#canal-7-capital">TV Pública</channel>
     <channel lang="es" xmltv_id="TyCSports.ar" site_id="ar#tyc-sports">TyC Sports</channel>
     <channel lang="es" xmltv_id="TyCSports2.ar" site_id="ar#tyc-alternativa">TyC Sports 2</channel>
diff --git a/sites/mtel.ba/mtel.ba.channels.xml b/sites/mtel.ba/mtel.ba.channels.xml
index 07b1767b..b84b18ef 100644
--- a/sites/mtel.ba/mtel.ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba.channels.xml
@@ -15,13 +15,13 @@
     <channel lang="bs" xmltv_id="AlJazeeraBalkans.ba" site_id="057#228">Aljazeera Balkans</channel>
     <channel lang="bs" xmltv_id="AmariTV.rs" site_id="640#370">Amari TV</channel>
     <channel lang="bs" xmltv_id="AnimalPlanetBosniaHerzegovina.ba" site_id="132#125">Animal Planet</channel>
-    <channel lang="bs" xmltv_id="ArenaEsport.rs" site_id="049#406">Arena Esport</channel>
-    <channel lang="bs" xmltv_id="ArenaFight.rs" site_id="085#434">Arena Fight</channel>
-    <channel lang="bs" xmltv_id="ArenaSport1.rs" site_id="101#53">Arena Sport 1</channel>
-    <channel lang="bs" xmltv_id="ArenaSport1x2.rs" site_id="126#441">Arena Sport 1x2</channel>
-    <channel lang="bs" xmltv_id="ArenaSport2.rs" site_id="102#54">Arena Sport 2</channel>
-    <channel lang="bs" xmltv_id="ArenaSport3.rs" site_id="103#55">Arena Sport 3</channel>
-    <channel lang="bs" xmltv_id="ArenaSport4.rs" site_id="104#56">Arena Sport 4</channel>
+    <channel lang="bs" xmltv_id="ArenaEsportSerbia.rs" site_id="049#406">Arena Esport</channel>
+    <channel lang="bs" xmltv_id="ArenaFightSerbia.rs" site_id="085#434">Arena Fight</channel>
+    <channel lang="bs" xmltv_id="ArenaSport1Serbia.rs" site_id="101#53">Arena Sport 1</channel>
+    <channel lang="bs" xmltv_id="ArenaSport1x2Serbia.rs" site_id="126#441">Arena Sport 1x2</channel>
+    <channel lang="bs" xmltv_id="ArenaSport2Serbia.rs" site_id="102#54">Arena Sport 2</channel>
+    <channel lang="bs" xmltv_id="ArenaSport3Serbia.rs" site_id="103#55">Arena Sport 3</channel>
+    <channel lang="bs" xmltv_id="ArenaSport4Serbia.rs" site_id="104#56">Arena Sport 4</channel>
     <channel lang="bs" xmltv_id="B92.rs" site_id="030#359">B92</channel>
     <channel lang="en" xmltv_id="BabesTV.us" site_id="910#373">Babes TV</channel>
     <channel lang="en" xmltv_id="BabyTV.uk" site_id="203#85">Baby TV Europe</channel>
@@ -134,7 +134,7 @@
     <channel lang="bs" xmltv_id="RockRoll.rs" site_id="609#230">Rock &amp; Roll</channel>
     <channel lang="bs" xmltv_id="Russia24.ru" site_id="802#195">Rossiya 24</channel>
     <channel lang="bs" xmltv_id="RTLCroatia.hr" site_id="043#456">RTL Hrvatska</channel>
-    <channel lang="bs" xmltv_id="RTLIIHungary.hu" site_id="044#457">RTL KETTŐ</channel>
+    <channel lang="bs" xmltv_id="RTLKETTO.hu" site_id="044#457">RTL KETTŐ</channel>
     <channel lang="bs" xmltv_id="RTLKockica.hr" site_id="205#459">RTL Kockica</channel>
     <channel lang="bs" xmltv_id="RTLLivingCroatia.hr" site_id="508#158">RTL Living Hrvatska</channel>
     <channel lang="en" xmltv_id="RT.ru" site_id="180#198">RT News</channel>
diff --git a/sites/mts.rs/mts.rs.channels.xml b/sites/mts.rs/mts.rs.channels.xml
index 6c85b9c0..2352ce31 100644
--- a/sites/mts.rs/mts.rs.channels.xml
+++ b/sites/mts.rs/mts.rs.channels.xml
@@ -8,17 +8,17 @@
     <channel lang="sr" xmltv_id="AlJazeeraBalkans.ba" site_id="654#25">Aljazeera Balkans</channel>
     <channel lang="sr" xmltv_id="AlternativnaTV.ba" site_id="657#530">Alternativna TV</channel>
     <channel lang="sr" xmltv_id="AnimalPlanetSerbia.rs" site_id="352#125">Animal Planet</channel>
-    <channel lang="sr" xmltv_id="ArenaEsport.rs" site_id="162#724">Arena Esport</channel>
-    <channel lang="sr" xmltv_id="ArenaFight.rs" site_id="161#766">Arena Fight</channel>
-    <channel lang="sr" xmltv_id="ArenaPremium1.rs" site_id="149#845">Arena Premium 1</channel>
-    <channel lang="sr" xmltv_id="ArenaPremium2.rs" site_id="150#846">Arena Premium 2</channel>
-    <channel lang="sr" xmltv_id="ArenaPremium3.rs" site_id="151#847">Arena Premium 3</channel>
-    <channel lang="sr" xmltv_id="ArenaSport1.rs" site_id="152#719">Arena Sport 1</channel>
-    <channel lang="sr" xmltv_id="ArenaSport1x2.rs" site_id="160#797">Arena Sport 1x2</channel>
-    <channel lang="sr" xmltv_id="ArenaSport2.rs" site_id="153#720">Arena Sport 2</channel>
-    <channel lang="sr" xmltv_id="ArenaSport3.rs" site_id="154#721">Arena Sport 3</channel>
-    <channel lang="sr" xmltv_id="ArenaSport4.rs" site_id="155#722">Arena Sport 4</channel>
-    <channel lang="sr" xmltv_id="ArenaSport5.rs" site_id="156#723">Arena Sport 5</channel>
+    <channel lang="sr" xmltv_id="ArenaEsportSerbia.rs" site_id="162#724">Arena Esport</channel>
+    <channel lang="sr" xmltv_id="ArenaFightSerbia.rs" site_id="161#766">Arena Fight</channel>
+    <channel lang="sr" xmltv_id="ArenaSport1PremiumSerbia.rs" site_id="149#845">Arena Premium 1</channel>
+    <channel lang="sr" xmltv_id="ArenaSport2PremiumSerbia.rs" site_id="150#846">Arena Premium 2</channel>
+    <channel lang="sr" xmltv_id="ArenaSport3PremiumSerbia.rs" site_id="151#847">Arena Premium 3</channel>
+    <channel lang="sr" xmltv_id="ArenaSport1Serbia.rs" site_id="152#719">Arena Sport 1</channel>
+    <channel lang="sr" xmltv_id="ArenaSport1x2Serbia.rs" site_id="160#797">Arena Sport 1x2</channel>
+    <channel lang="sr" xmltv_id="ArenaSport2Serbia.rs" site_id="153#720">Arena Sport 2</channel>
+    <channel lang="sr" xmltv_id="ArenaSport3Serbia.rs" site_id="154#721">Arena Sport 3</channel>
+    <channel lang="sr" xmltv_id="ArenaSport4Serbia.rs" site_id="155#722">Arena Sport 4</channel>
+    <channel lang="sr" xmltv_id="ArenaSport5Serbia.rs" site_id="156#723">Arena Sport 5</channel>
     <channel lang="sr" xmltv_id="ArenaSport6Croatia.hr" site_id="157#838">Arena Sport 6</channel>
     <channel lang="sr" xmltv_id="ArenaSport7Croatia.hr" site_id="158#839">Arena Sport 7</channel>
     <channel lang="sr" xmltv_id="ArenaSport8Croatia.hr" site_id="159#840">Arena Sport 8</channel>
diff --git a/sites/telenet.tv/telenet.tv.channels.xml b/sites/telenet.tv/telenet.tv.channels.xml
index a2c0cc95..3ab0ff8e 100644
--- a/sites/telenet.tv/telenet.tv.channels.xml
+++ b/sites/telenet.tv/telenet.tv.channels.xml
@@ -84,7 +84,7 @@
     <channel lang="nl" xmltv_id="PlaySports2.be" site_id="sportinghd2">Play Sports 2</channel>
     <channel lang="nl" xmltv_id="PlaySports3.be" site_id="sporting3">Play Sports 3</channel>
     <channel lang="nl" xmltv_id="PlaySports4.be" site_id="sporting4">Play Sports 4</channel>
-    <channel lang="en" xmltv_id="PlaySports5.be" site_id="sporting5">Play Sports 5</channel>
+    <channel lang="en" xmltv_id="PlaySports5PremierLeague.be" site_id="sporting5">Play Sports 5</channel>
     <channel lang="nl" xmltv_id="PlaySportsGolf.be" site_id="primegolf">Play Sports Golf</channel>
     <channel lang="nl" xmltv_id="PlaySportsOpen.be" site_id="rexrioinfo">Play Sports Open</channel>
     <channel lang="fr" xmltv_id="PlugRTL.be" site_id="plugrtl">Plug RTL</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 78bbc809..0698dae2 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -9,12 +9,12 @@
     <channel lang="sl" xmltv_id="Alsat.mk" site_id="1000219">Alsat-M</channel>
     <channel lang="sl" xmltv_id="AMCSlovenia.si" site_id="1000523">AMC HD</channel>
     <channel lang="sl" xmltv_id="AnixeHDSerie.de" site_id="1000057">Anixe HD Serie</channel>
-    <channel lang="sl" xmltv_id="ArenaEsport.rs" site_id="1000683">Arena Esport</channel>
-    <channel lang="sl" xmltv_id="ArenaFight.rs" site_id="1000777">Arena Fight</channel>
-    <channel lang="sl" xmltv_id="ArenaSport1.rs" site_id="1000688">Arena Sport 1</channel>
-    <channel lang="sl" xmltv_id="ArenaSport2.rs" site_id="1000689">Arena Sport 2</channel>
-    <channel lang="sl" xmltv_id="ArenaSport3.rs" site_id="1000787">Arena Sport 3</channel>
-    <channel lang="sl" xmltv_id="ArenaSport4.rs" site_id="1000788">Arena Sport 4</channel>
+    <channel lang="sl" xmltv_id="ArenaEsportSerbia.rs" site_id="1000683">Arena Esport</channel>
+    <channel lang="sl" xmltv_id="ArenaFightSerbia.rs" site_id="1000777">Arena Fight</channel>
+    <channel lang="sl" xmltv_id="ArenaSport1Serbia.rs" site_id="1000688">Arena Sport 1</channel>
+    <channel lang="sl" xmltv_id="ArenaSport2Serbia.rs" site_id="1000689">Arena Sport 2</channel>
+    <channel lang="sl" xmltv_id="ArenaSport3Serbia.rs" site_id="1000787">Arena Sport 3</channel>
+    <channel lang="sl" xmltv_id="ArenaSport4Serbia.rs" site_id="1000788">Arena Sport 4</channel>
     <channel lang="sl" xmltv_id="ARTEFrance.fr" site_id="1000026">ARTE Français</channel>
     <channel lang="sl" xmltv_id="ATMTV.si" site_id="1000001">ATM TV</channel>
     <channel lang="sl" xmltv_id="B92.rs" site_id="1000207">B92</channel>
@@ -191,7 +191,7 @@
     <channel lang="sl" xmltv_id="RTL2Croatia.hr" site_id="1000322">RTL 2 HR</channel>
     <channel lang="sl" xmltv_id="RTLCroatia.hr" site_id="1000314">RTL</channel>
     <channel lang="sl" xmltv_id="RTLGermany.de" site_id="70">RTL Deutschland</channel>
-    <channel lang="sl" xmltv_id="RTLIIHungary.hu" site_id="71">RTL KETTŐ</channel>
+    <channel lang="sl" xmltv_id="RTLKETTO.hu" site_id="71">RTL KETTŐ</channel>
     <channel lang="sl" xmltv_id="RTLKockica.hr" site_id="1000355">RTL Kockica</channel>
     <channel lang="sl" xmltv_id="RTLLivingGermany.de" site_id="1000323">RTL Living</channel>
     <channel lang="sl" xmltv_id="RTRSTV.ba" site_id="1000185">RTRS TV</channel>
diff --git a/sites/tvim.tv/tvim.tv.channels.xml b/sites/tvim.tv/tvim.tv.channels.xml
index 7b393313..ad63bb97 100644
--- a/sites/tvim.tv/tvim.tv.channels.xml
+++ b/sites/tvim.tv/tvim.tv.channels.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tvim.tv">
   <channels>
-    <channel lang="sq" xmltv_id="ArenaSport1.rs" site_id="ARENASPORT1">Arena Sport 1</channel>
-    <channel lang="sq" xmltv_id="ArenaSport2.rs" site_id="ARENASPORT2">Arena Sport 2</channel>
-    <channel lang="sq" xmltv_id="ArenaSport3.rs" site_id="ARENASPORT3">Arena Sport 3</channel>
-    <channel lang="sq" xmltv_id="ArenaSport4.rs" site_id="ARENASPORT4">Arena Sport 4</channel>
-    <channel lang="sq" xmltv_id="ArenaSport5.rs" site_id="ARENASPORT5">Arena Sport 5</channel>
+    <channel lang="sq" xmltv_id="ArenaSport1Serbia.rs" site_id="ARENASPORT1">Arena Sport 1</channel>
+    <channel lang="sq" xmltv_id="ArenaSport2Serbia.rs" site_id="ARENASPORT2">Arena Sport 2</channel>
+    <channel lang="sq" xmltv_id="ArenaSport3Serbia.rs" site_id="ARENASPORT3">Arena Sport 3</channel>
+    <channel lang="sq" xmltv_id="ArenaSport4Serbia.rs" site_id="ARENASPORT4">Arena Sport 4</channel>
+    <channel lang="sq" xmltv_id="ArenaSport5Serbia.rs" site_id="ARENASPORT5">Arena Sport 5</channel>
     <channel lang="sq" xmltv_id="BabyTV.uk" site_id="BABYTV">Baby TV Europe</channel>
     <channel lang="sq" xmltv_id="BangBang.al" site_id="BANGBANG">Bang Bang</channel>
     <channel lang="sq" xmltv_id="BoomerangCEE.us" site_id="BOOMERANG">Boomerang Central &amp; Eastern Europe</channel>
diff --git a/sites/tvpassport.com/tvpassport.com.channels.xml b/sites/tvpassport.com/tvpassport.com.channels.xml
index 112cfe65..d4ec14c5 100644
--- a/sites/tvpassport.com/tvpassport.com.channels.xml
+++ b/sites/tvpassport.com/tvpassport.com.channels.xml
@@ -213,7 +213,7 @@
     <channel lang="es" xmltv_id="GalavisionWest.us" site_id="galavision-pacific-feed/1573">Galavision West</channel>
     <channel lang="en" xmltv_id="GameShowNetworkEast.us" site_id="game-show-network-east/329">Game Show Network - East</channel>
     <channel lang="en" xmltv_id="GlobalNewsBC1.ca" site_id="global-bc/31">Global BC</channel>
-    <channel lang="en" xmltv_id="GolTV.us" site_id="gol-tv-usa-hd/12608">GolTV US</channel>
+    <channel lang="en" xmltv_id="GolTVUSA.us" site_id="gol-tv-usa-hd/12608">GolTV US</channel>
     <channel lang="en" xmltv_id="GreatAmericanCountry.us" site_id="gac-family-east/1051">Great American Family (GAC)</channel>
     <channel lang="en" xmltv_id="GreatAmericanLiving.us" site_id="gac-living/16158">Great American Living</channel>
     <channel lang="en" xmltv_id="Grit.us" site_id="grit-network/14377">Grit</channel>
diff --git a/sites/tvtv.us/tvtv.us.channels.xml b/sites/tvtv.us/tvtv.us.channels.xml
index bef0a164..905b1e2b 100644
--- a/sites/tvtv.us/tvtv.us.channels.xml
+++ b/sites/tvtv.us/tvtv.us.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="en" xmltv_id="AMCEast.us" site_id="10021">AMC East</channel>
     <channel lang="en" xmltv_id="AMCPlus.us" site_id="114759">AMC Plus</channel>
     <channel lang="en" xmltv_id="AMCWest.us" site_id="31556">AMC West</channel>
-    <channel lang="en" xmltv_id="AmericanHeroesChannelUSA.us" site_id="78808">American Heroes Channel</channel>
+    <channel lang="en" xmltv_id="AmericanHeroesChannel.us" site_id="78808">American Heroes Channel</channel>
     <channel lang="en" xmltv_id="AmericasAuctionChannel.us" site_id="50180">America's Auction Channel</channel>
     <channel lang="en" xmltv_id="AMItv.ca" site_id="10756">AMI-tv</channel>
     <channel lang="en" xmltv_id="AMP2.us" site_id="94852">AMP2</channel>
@@ -282,8 +282,8 @@
     <channel lang="en" xmltv_id="GMAPinoyTV.ph" site_id="46463">GMA Pinoy TV</channel>
     <channel lang="en" xmltv_id="GodTV.uk" site_id="52697">GodTV</channel>
     <channel lang="en" xmltv_id="GolfChannel.us" site_id="61854">Golf Channel</channel>
-    <channel lang="en" xmltv_id="GolTV.us" site_id="32161">Gol TV</channel>
-    <channel lang="en" xmltv_id="GolTVSpanish.us" site_id="33691">GolTV English</channel>
+    <channel lang="en" xmltv_id="GolTVUSA.us" site_id="32161">Gol TV</channel>
+    <!-- <channel lang="en" xmltv_id="" site_id="33691">GolTV English</channel> -->
     <channel lang="en" xmltv_id="GreatAmericanCountry.us" site_id="16062">Great American Country</channel>
     <channel lang="en" xmltv_id="Grit.us" site_id="89922">Grit</channel>
     <channel lang="en" xmltv_id="HallmarkChannelEast.us" site_id="11221">Hallmark Channel East</channel>