diff --git a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
index c450c111..4216907d 100644
--- a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
+++ b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
@@ -131,7 +131,7 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="719">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="830">NHK World Japan</channel>
     <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="473">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrancePlus1.us" site_id="2065">Nickelodeon France +1</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrancePlus1.fr" site_id="2065">Nickelodeon France +1</channel>
     <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="888">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NickelodeonTeen.fr" site_id="1746">Nickelodeon Teen</channel>
     <channel lang="fr" xmltv_id="NitroGermany.de" site_id="2311">Nitro Deutschland</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index 4499bf8e..d313acdd 100644
--- a/sites/directv.com/directv.com_us.channels.xml
+++ b/sites/directv.com/directv.com_us.channels.xml
@@ -22,7 +22,7 @@
     <channel lang="en" xmltv_id="AWE.us" site_id="387">AWE</channel>
     <channel lang="en" xmltv_id="AXSTV.us" site_id="340">AXS TV</channel>
     <channel lang="en" xmltv_id="AztecaUSEast.mx" site_id="441">Azteca US Este</channel>
-    <channel lang="en" xmltv_id="BabyFirstTV.us" site_id="293">BabyFirst TV</channel>
+    <channel lang="en" xmltv_id="BabyFirst.us" site_id="293">BabyFirst TV</channel>
     <channel lang="en" xmltv_id="BabyTVLatinAmerica.uk" site_id="425">Baby TV Latin America</channel>
     <channel lang="en" xmltv_id="BandamaxEstadosUnidos.mx" site_id="433">Bandamax Estados Unidos</channel>
     <channel lang="en" xmltv_id="BangU.us" site_id="596">Bang U</channel>
@@ -31,7 +31,7 @@
     <channel lang="en" xmltv_id="BestChannel.us" site_id="88">Best Channel</channel>
     <channel lang="en" xmltv_id="BETEast.us" site_id="329">BET East</channel>
     <channel lang="en" xmltv_id="BETHerEast.us" site_id="330">BET Her East</channel>
-    <channel lang="en" xmltv_id="BloombergTVUS.us" site_id="353">Bloomberg TV US</channel>
+    <channel lang="en" xmltv_id="BloombergTV.us" site_id="353">Bloomberg TV US</channel>
     <channel lang="en" xmltv_id="BoomerangUS.us" site_id="298">Boomerang US</channel>
     <channel lang="en" xmltv_id="BravoEast.us" site_id="237">Bravo East</channel>
     <channel lang="en" xmltv_id="BrazzersTVMonthlyOffer.us" site_id="580">Brazzers TV Monthly Offer</channel>
@@ -320,7 +320,7 @@
     <channel lang="en" xmltv_id="SurPeru.us" site_id="439">Sur Perú</channel>
     <channel lang="en" xmltv_id="SyfyEast.us" site_id="244">Syfy East</channel>
     <channel lang="en" xmltv_id="TANTV.us" site_id="2089">TAN TV</channel>
-    <channel lang="en" xmltv_id="TBNUS.us" site_id="372">TBN US</channel>
+    <channel lang="en" xmltv_id="TBNEast.us" site_id="372">TBN US</channel>
     <channel lang="en" xmltv_id="TBSEast.us" site_id="247">TBS East</channel>
     <channel lang="en" xmltv_id="TCMUS.us" site_id="256">TCM US</channel>
     <channel lang="en" xmltv_id="TCT.us" site_id="377">TCT</channel>
diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index f1a082e7..dc63a262 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -43,9 +43,9 @@
     <channel lang="en" xmltv_id="ChannelWIN.in" site_id="10000000020470000">Channel WIN</channel>
     <channel lang="en" xmltv_id="ChardiklaTimeTV.in" site_id="10000000003050000">Chardikla Time TV</channel>
     <channel lang="en" xmltv_id="CinemaTV.in" site_id="10000000009290000">Cinema TV</channel>
-    <channel lang="en" xmltv_id="CNBCAwaaz.us" site_id="10000000000890000">CNBC Awaaz</channel>
-    <channel lang="en" xmltv_id="CNBCBajar.us" site_id="10000000022380000">CNBC Bajar</channel>
-    <channel lang="en" xmltv_id="CNBCTV18.us" site_id="10000000007480000">CNBC TV 18</channel>
+    <channel lang="en" xmltv_id="CNBCAwaaz.in" site_id="10000000000890000">CNBC Awaaz</channel>
+    <channel lang="en" xmltv_id="CNBCBajar.in" site_id="10000000022380000">CNBC Bajar</channel>
+    <channel lang="en" xmltv_id="CNBCTV18.in" site_id="10000000007480000">CNBC TV 18</channel>
     <channel lang="en" xmltv_id="CNNInternationalSouthAsia.us" site_id="10000000000770000">CNN International South Asia</channel>
     <channel lang="en" xmltv_id="CNNNews18.in" site_id="10000000000780000">CNN News 18</channel>
     <channel lang="en" xmltv_id="Colors.in" site_id="10000000007460000">Colors</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index 36060adc..6a3bc66d 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -94,7 +94,7 @@
     <channel lang="hu" xmltv_id="KolcseyTV.hu" site_id="KOLCSEY_TV">Kölcsey TV</channel>
     <channel lang="hu" xmltv_id="LifeTV.hu" site_id="LIFE_TV">Life TV (HD)</channel>
     <channel lang="hu" xmltv_id="LoveNature.ca" site_id="LOVE_NATURE">Love Nature (HD / 4K)</channel>
-    <channel lang="hu" xmltv_id="LoveNature4K.us" site_id="LOVE_NATURE">Love Nature (HD / 4K)</channel>
+    <channel lang="hu" xmltv_id="LoveNature4K.ca" site_id="LOVE_NATURE">Love Nature (HD / 4K)</channel>
     <channel lang="hu" xmltv_id="M1.hu" site_id="M1">M1 (HD)</channel>
     <channel lang="hu" xmltv_id="M2.hu" site_id="M2">M2 / Petőfi (HD)</channel>
     <channel lang="hu" xmltv_id="M4Sport.hu" site_id="M4_SPORT">M4 Sport (HD)</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
index f1cd3360..d258ccf6 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="pl" xmltv_id="AXNPoland.us" site_id="axn-249">AXN Polska</channel>
     <channel lang="pl" xmltv_id="AXNSpinPoland.us" site_id="axn-spin-294">AXN Spin Polska</channel>
     <channel lang="pl" xmltv_id="AXNWhitePoland.us" site_id="axn-white-272">AXN White Polska</channel>
-    <channel lang="pl" xmltv_id="BabyFirstTV.us" site_id="babyfirsttv-282">BabyFirst TV</channel>
+    <channel lang="pl" xmltv_id="BabyFirst.us" site_id="babyfirsttv-282">BabyFirst TV</channel>
     <channel lang="pl" xmltv_id="BabyTVEurope.uk" site_id="baby-tv-285">Baby TV Europe</channel>
     <channel lang="pl" xmltv_id="BBCBritPoland.uk" site_id="bbc-brit-275">BBC Brit Polska</channel>
     <channel lang="pl" xmltv_id="BBCEarthPoland.uk" site_id="bbc-earth-274">BBC Earth Polska</channel>
diff --git a/sites/rev.bs/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
index 98edc72b..1b96627e 100644
--- a/sites/rev.bs/rev.bs_bs.channels.xml
+++ b/sites/rev.bs/rev.bs_bs.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="en" xmltv_id="Ant1Satellite.gr" site_id="681">Ant1 Satellite</channel>
     <channel lang="en" xmltv_id="AWE.us" site_id="267">AWE</channel>
     <channel lang="en" xmltv_id="AXSTV.us" site_id="369">AXS TV</channel>
-    <channel lang="en" xmltv_id="BabyFirstTV.us" site_id="318">BabyFirst TV</channel>
+    <channel lang="en" xmltv_id="BabyFirst.us" site_id="318">BabyFirst TV</channel>
     <channel lang="en" xmltv_id="BBCAmericaEast.uk" site_id="485">BBC America East</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsAmericas.uk" site_id="409">BBC World News Americas</channel>
     <channel lang="en" xmltv_id="BCNTV.bs" site_id="660">BCN TV</channel>
@@ -19,7 +19,7 @@
     <channel lang="en" xmltv_id="BETJams.us" site_id="376">BET Jams</channel>
     <channel lang="en" xmltv_id="BETSoul.us" site_id="379">BET Soul</channel>
     <channel lang="en" xmltv_id="BigTenNetwork.us" site_id="713">Big Ten Network</channel>
-    <channel lang="en" xmltv_id="BloombergTVUS.us" site_id="417">Bloomberg TV US</channel>
+    <channel lang="en" xmltv_id="BloombergTV.us" site_id="417">Bloomberg TV US</channel>
     <channel lang="en" xmltv_id="BoomerangUS.us" site_id="312">Boomerang US</channel>
     <channel lang="en" xmltv_id="Bounce.us" site_id="367">Bounce</channel>
     <channel lang="en" xmltv_id="Bravo.us" site_id="483">Bravo</channel>
@@ -153,7 +153,7 @@
     <channel lang="en" xmltv_id="StarHits.us" site_id="557">Star Hits</channel>
     <channel lang="en" xmltv_id="StarSeries.us" site_id="555">Star Series</channel>
     <channel lang="en" xmltv_id="SyfyEast.us" site_id="222">Syfy East</channel>
-    <channel lang="en" xmltv_id="TBNUS.us" site_id="650">TBN US</channel>
+    <channel lang="en" xmltv_id="TBNEast.us" site_id="650">TBN US</channel>
     <channel lang="en" xmltv_id="TBSEast.us" site_id="225">TBS East</channel>
     <channel lang="en" xmltv_id="TCMAmericaLatina.us" site_id="492">TCM América Latina</channel>
     <channel lang="en" xmltv_id="TeenNickUSEast.us" site_id="315">TeenNick East</channel>
diff --git a/sites/transvision.co.id/transvision.co.id_id.channels.xml b/sites/transvision.co.id/transvision.co.id_id.channels.xml
index e475634e..dd3740e2 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="id" xmltv_id="ANTV.id" site_id="ANTV">ANTV</channel>
     <channel lang="id" xmltv_id="ArirangTV.kr" site_id="ARI">Arirang</channel>
     <channel lang="id" xmltv_id="AXNEastAsia.us" site_id="AXN">AXN HD</channel>
-    <channel lang="id" xmltv_id="BabyFirstTV.us" site_id="BBF">Baby First</channel>
+    <channel lang="id" xmltv_id="BabyFirst.us" site_id="BBF">Baby First</channel>
     <channel lang="id" xmltv_id="BeritaSatu.id" site_id="BST">BeritaSatu</channel>
     <channel lang="id" xmltv_id="BioskopIndonesia.id" site_id="TRBI">Bioskop Indonesia</channel>
     <channel lang="id" xmltv_id="BloombergTVAsia.us" site_id="BLO">Bloomberg TV</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index 2fa8db45..1f239227 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -64,7 +64,7 @@
     <channel lang="de" xmltv_id="Folx.de" site_id="180">Folx</channel>
     <channel lang="de" xmltv_id="GameTV.ch" site_id="1224">Game TV</channel>
     <channel lang="de" xmltv_id="GeoTV.de" site_id="1333">Geo TV</channel>
-    <channel lang="de" xmltv_id="GoldstarTV.de" site_id="1786">Goldstar TV</channel>
+    <channel lang="de" xmltv_id="GoldstarTVGermany.us" site_id="1786">Goldstar TV</channel>
     <channel lang="de" xmltv_id="GoTV.at" site_id="194">GoTV</channel>
     <channel lang="de" xmltv_id="Heimatkanal.de" site_id="664">Heimatkanal</channel>
     <channel lang="de" xmltv_id="HelvetiaOneTV.ch" site_id="1040">Helvetia One TV</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
index 3f92e1cb..5c72b660 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -219,7 +219,7 @@
     <channel lang="ru" xmltv_id="STSLove.ru" site_id="213#sts-love-104">STS Love</channel>
     <channel lang="ru" xmltv_id="T24.ru" site_id="213#tehno-24-1109">T24</channel>
     <channel lang="ru" xmltv_id="TaynyGalaktiki.ru" site_id="213#tayny-galaktiki-736">Tayny Galaktiki</channel>
-    <channel lang="ru" xmltv_id="TBNRossiya.us" site_id="213#tbn-601">TBN Rossiya</channel>
+    <channel lang="ru" xmltv_id="TBN.ru" site_id="213#tbn-601">TBN Rossiya</channel>
     <channel lang="ru" xmltv_id="TDK.ru" site_id="213#tdk-78">TDK</channel>
     <channel lang="ru" xmltv_id="Telecafe.ru" site_id="213#telekafe-443">Telecafé</channel>
     <channel lang="ru" xmltv_id="Telekanal2x2.ru" site_id="213#2x2-29">Telekanal 2x2</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index b92299d1..cf0ef1ad 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="en" xmltv_id="AWE.us" site_id="44895">AWE</channel>
     <channel lang="en" xmltv_id="AXSTV.us" site_id="92053">AXS TV</channel>
     <channel lang="en" xmltv_id="B4UMusicUSA.in" site_id="24465">B4U Music USA</channel>
-    <channel lang="en" xmltv_id="BabyFirstTV.us" site_id="50338">BabyFirst TV</channel>
+    <channel lang="en" xmltv_id="BabyFirst.us" site_id="50338">BabyFirst TV</channel>
     <channel lang="en" xmltv_id="BallySportsArizona.us" site_id="102044">Bally Sports Arizona</channel>
     <channel lang="en" xmltv_id="BallySportsArizonaPlus.us" site_id="31547">Bally Sports Arizona+</channel>
     <channel lang="en" xmltv_id="BallySportsDetroit.us" site_id="102047">Bally Sports Detroit</channel>
@@ -178,7 +178,7 @@
     <channel lang="en" xmltv_id="ESPNU.us" site_id="45654">ESPNU</channel>
     <channel lang="en" xmltv_id="ESPNUS.us" site_id="10179">ESPN</channel>
     <channel lang="en" xmltv_id="ESPNews.us" site_id="59976">ESPNEWS</channel>
-    <channel lang="en" xmltv_id="EstrellaTV.us" site_id="65064">Estrella TV</channel>
+    <channel lang="en" xmltv_id="EstrellaTVEast.us" site_id="65064">Estrella TV</channel>
     <channel lang="en" xmltv_id="EsTV.us" site_id="14987">ES.TV</channel>
     <channel lang="en" xmltv_id="ETLive.us" site_id="110291">Entertainment Tonight Live</channel>
     <channel lang="en" xmltv_id="ETTVAmerica.tw" site_id="10487">ETTV America</channel>
@@ -257,7 +257,7 @@
     <channel lang="en" xmltv_id="HBOZoneEast.us" site_id="18431">HBO Zone East</channel>
     <channel lang="en" xmltv_id="HBOZoneWest.us" site_id="18432">HBO Zone West</channel>
     <channel lang="en" xmltv_id="HDNetMovies.us" site_id="33668">HDNet Movies</channel>
-    <channel lang="en" xmltv_id="Heartland.us" site_id="121952">Heartland</channel>
+    <channel lang="en" xmltv_id="HeartlandEast.us" site_id="121952">Heartland</channel>
     <channel lang="en" xmltv_id="HeroesIcons.us" site_id="81349">Heroes &amp; Icons</channel>
     <channel lang="en" xmltv_id="HeroesIconsEast.us" site_id="81349">Heroes &amp; Icons East</channel>
     <channel lang="en" xmltv_id="HGTVEast.us" site_id="14902">HGTV East</channel>
@@ -1285,7 +1285,7 @@
     <channel lang="en" xmltv_id="SmartLifeStyleTV.us" site_id="88293">Smart LifeStyle TV</channel>
     <channel lang="en" xmltv_id="SmithsonianChannelEast.us" site_id="58532">Smithsonian</channel>
     <channel lang="en" xmltv_id="SonyMix.in" site_id="80171">Sony Mix</channel>
-    <channel lang="en" xmltv_id="SonyMovies.us" site_id="69091">Sony Movies</channel>
+    <channel lang="en" xmltv_id="SonyMoviesUSA.us" site_id="69091">Sony Movies</channel>
     <channel lang="en" xmltv_id="SonySABUSA.in" site_id="16030">Sony SAB TV USA</channel>
     <channel lang="en" xmltv_id="SpectrumOC16.us" site_id="9581">Spectrum OC16</channel>
     <channel lang="en" xmltv_id="SpectrumSportsNet.us" site_id="77375">Spectrum SportsNet</channel>
@@ -1342,7 +1342,7 @@
     <channel lang="en" xmltv_id="TheAfricaChannel.us" site_id="47472">The Africa Channel</channel>
     <channel lang="en" xmltv_id="TheCountryNetwork.us" site_id="69639">The Country Network</channel>
     <channel lang="en" xmltv_id="TheCowboyChannel.us" site_id="10188">The Cowboy Channel</channel>
-    <channel lang="en" xmltv_id="TheFamilyChannel.us" site_id="11156">The Family Channel</channel>
+    <channel lang="en" xmltv_id="TheFamilyChannelEast.us" site_id="11156">The Family Channel</channel>
     <channel lang="en" xmltv_id="TheIsraeliNetwork.il" site_id="27549">The Israeli Network</channel>
     <channel lang="en" xmltv_id="TheMovieChannelEast.us" site_id="11160">The Movie Channel East</channel>
     <channel lang="en" xmltv_id="TheMovieChannelWest.us" site_id="12509">The Movie Channel West</channel>