diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml
index beb1cb0d..3657c68d 100644
--- a/sites/allente.se/allente.se_dk.channels.xml
+++ b/sites/allente.se/allente.se_dk.channels.xml
@@ -15,7 +15,7 @@
     <channel lang="da" xmltv_id="CNNInternationalEurope.us" site_id="dk#0033">CNN International Europe</channel>
     <channel lang="da" xmltv_id="DisneyChannelScandinavia.uk" site_id="dk#0037">Disney Channel Scandinavia</channel>
     <channel lang="da" xmltv_id="DisneyJuniorScandinavia.uk" site_id="dk#0307">Disney Junior Scandinavia</channel>
-    <channel lang="da" xmltv_id="DK4.dk" site_id="dk#0376">DK 4</channel>
+    <channel lang="da" xmltv_id="Dk4.dk" site_id="dk#0376">DK 4</channel>
     <channel lang="da" xmltv_id="DR1.dk" site_id="dk#452">DR 1</channel>
     <channel lang="da" xmltv_id="DR2.dk" site_id="dk#0051">DR 2</channel>
     <channel lang="da" xmltv_id="DRRamasjang.dk" site_id="dk#0048">DR Ramasjang</channel>
diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml
index c3d925d4..e3a1d94f 100644
--- a/sites/allente.se/allente.se_no.channels.xml
+++ b/sites/allente.se/allente.se_no.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="no" xmltv_id="FEM.no" site_id="no#0056">FEM</channel>
     <channel lang="no" xmltv_id="Kunskapskanalen.se" site_id="no#0149">Kunskapskanalen</channel>
     <channel lang="no" xmltv_id="Matkanalen.no" site_id="no#565">Matkanalen</channel>
-    <channel lang="no" xmltv_id="Max.no" site_id="no#533">Max</channel>
+    <channel lang="no" xmltv_id="MAX.no" site_id="no#533">Max</channel>
     <channel lang="no" xmltv_id="MTV00s.uk" site_id="no#0246">MTV 00s</channel>
     <channel lang="no" xmltv_id="MTV80s.uk" site_id="no#604">MTV 80s</channel>
     <channel lang="no" xmltv_id="MTVHitsEurope.uk" site_id="no#0077">MTV Hits Europe</channel>
@@ -59,7 +59,7 @@
     <channel lang="no" xmltv_id="ViasatExplore.se" site_id="no#0358">Viasat Explore</channel>
     <channel lang="no" xmltv_id="ViasatHistoryHD.se" site_id="no#0357">Viasat History HD</channel>
     <channel lang="no" xmltv_id="ViasatNature.se" site_id="no#0250">Viasat Nature</channel>
-    <channel lang="no" xmltv_id="Vox.no" site_id="no#535">Vox</channel>
+    <channel lang="no" xmltv_id="VOX.no" site_id="no#535">Vox</channel>
     <channel lang="no" xmltv_id="VSeries.se" site_id="no#0320">V Series</channel>
     <channel lang="no" xmltv_id="VSport1Norway.no" site_id="no#0365">V Sport 1 Norge</channel>
     <channel lang="no" xmltv_id="VSport2.no" site_id="no#608">V Sport 2</channel>
diff --git a/sites/astro.com.my/astro.com.my_my.channels.xml b/sites/astro.com.my/astro.com.my_my.channels.xml
index 91b36d70..d70f562a 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -47,15 +47,15 @@
     <channel lang="ms" xmltv_id="AstroWarna.my" site_id="272">Astro Warna</channel>
     <channel lang="ms" xmltv_id="AstroXiaoTaiYang.my" site_id="387">Astro Xiao Tai Yang</channel>
     <channel lang="ms" xmltv_id="AwesomeTV.my" site_id="433">Awesome TV</channel>
-    <channel lang="ms" xmltv_id="BBCBritMalaysia.uk" site_id="459">BBC Brit Malaysia</channel>
+    <channel lang="ms" xmltv_id="BBCBritMalaysia.my" site_id="459">BBC Brit Malaysia</channel>
     <channel lang="ms" xmltv_id="BBCEarthAsia.uk" site_id="452">BBC Earth Asia</channel>
-    <channel lang="ms" xmltv_id="BBCFirstMalaysia.uk" site_id="458">BBC First Malaysia</channel>
+    <channel lang="ms" xmltv_id="BBCFirstMalaysia.my" site_id="458">BBC First Malaysia</channel>
     <channel lang="ms" xmltv_id="BBCLifestyleAsia.uk" site_id="451">BBC Lifestyle Asia</channel>
     <channel lang="ms" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="366">BBC World News Asia Pacific</channel>
     <channel lang="ms" xmltv_id="BernamaTV.my" site_id="160">Bernama TV</channel>
     <channel lang="ms" xmltv_id="BloombergTVAsia.us" site_id="422">Bloomberg TV Asia</channel>
     <channel lang="ms" xmltv_id="Boo.my" site_id="251">Boo</channel>
-    <channel lang="ms" xmltv_id="BoomerangSouthEastAsia.us" site_id="430">Boomerang South East Asia</channel>
+    <channel lang="ms" xmltv_id="BoomerangSoutheastAsia.us" site_id="430">Boomerang South East Asia</channel>
     <channel lang="ms" xmltv_id="CCTV4Asia.cn" site_id="385">CCTV 4 Asia</channel>
     <channel lang="ms" xmltv_id="CGTN.cn" site_id="426">CGTN</channel>
     <channel lang="ms" xmltv_id="CNA.sg" site_id="295">CNA</channel>
@@ -91,7 +91,7 @@
     <channel lang="ms" xmltv_id="HistoryAsia.us" site_id="144">History Asia</channel>
     <channel lang="ms" xmltv_id="Hits.sg" site_id="179">Hits</channel>
     <channel lang="ms" xmltv_id="HitsMovies.sg" site_id="391">Hits Movies</channel>
-    <channel lang="ms" xmltv_id="Iqiyi.cn" site_id="355">Iqiyi</channel>
+    <channel lang="ms" xmltv_id="iQIYI.cn" site_id="355">Iqiyi</channel>
     <channel lang="ms" xmltv_id="KBSWorld.kr" site_id="161">KBS World</channel>
     <channel lang="ms" xmltv_id="KPlus.sg" site_id="266">K+</channel>
     <channel lang="ms" xmltv_id="Kix.hk" site_id="157">Kix</channel>
@@ -134,7 +134,7 @@
     <channel lang="ms" xmltv_id="TVBXingHe.hk" site_id="383">TVB Xing He</channel>
     <channel lang="ms" xmltv_id="TVNMovies.hk" site_id="274">TVN Movies</channel>
     <channel lang="ms" xmltv_id="TVS.my" site_id="429">TVS</channel>
-    <channel lang="ms" xmltv_id="TaDaa.my" site_id="432">Ta-Daa!</channel>
+    <channel lang="ms" xmltv_id="TADAA.my" site_id="432">Ta-Daa!</channel>
     <channel lang="ms" xmltv_id="WWENetwork.us" site_id="194">WWE Network</channel>
     <channel lang="ms" xmltv_id="WarnerTVSoutheastAsia.us" site_id="270">Warner TV Southeast Asia</channel>
     <channel lang="ms" xmltv_id="ZeeTamil.in" site_id="297">Zee Tamil Malaysia</channel>
diff --git a/sites/canalplus.com/canalplus.com_fr.channels.xml b/sites/canalplus.com/canalplus.com_fr.channels.xml
index c38a9c22..8ea7dd36 100644
--- a/sites/canalplus.com/canalplus.com_fr.channels.xml
+++ b/sites/canalplus.com/canalplus.com_fr.channels.xml
@@ -40,7 +40,7 @@
     <channel lang="fr" xmltv_id="CanalPlusFrance.fr" site_id="301">CANAL+</channel>
     <channel lang="fr" xmltv_id="CanalPlusGrandEcran.fr" site_id="900">CANAL+GRAND ECRAN</channel>
     <channel lang="fr" xmltv_id="CanalPlusKids.fr" site_id="259">CANAL+KIDS</channel>
-    <channel lang="fr" xmltv_id="CanalPlusMotoGp.fr" site_id="823">CANAL+MOTOGP</channel>
+    <channel lang="fr" xmltv_id="CanalPlusMotoGP.fr" site_id="823">CANAL+MOTOGP</channel>
     <channel lang="fr" xmltv_id="CanalPlusPremierLeague.fr" site_id="815">CANAL+PREMIER LEAGUE</channel>
     <channel lang="fr" xmltv_id="CanalPlusSeriesFrance.fr" site_id="481">CANAL+SERIES</channel>
     <channel lang="fr" xmltv_id="CanalPlusSport2.fr" site_id="861">CANAL+ SPORT 2 (CH)</channel>
@@ -148,7 +148,7 @@
     <channel lang="fr" xmltv_id="MultiSports4.fr" site_id="565">MULTISPORTS 4</channel>
     <channel lang="fr" xmltv_id="MultiSports5.fr" site_id="566">MULTISPORTS 5</channel>
     <channel lang="fr" xmltv_id="MultiSports6.fr" site_id="567">MULTISPORTS 6</channel>
-    <channel lang="fr" xmltv_id="Museum.fr" site_id="678">MUSEUM</channel>
+    <channel lang="fr" xmltv_id="MuseumTV.fr" site_id="678">MUSEUM</channel>
     <channel lang="fr" xmltv_id="MyZenTV.fr" site_id="656">MY ZEN TV</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.fr" site_id="302">NATIONAL GEO</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.fr" site_id="290">NATIONAL GEOGRAPHIC WILD</channel>
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 d7c3c36b..a6ef8c82 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
@@ -30,7 +30,7 @@
     <channel lang="fr" xmltv_id="BloombergTVEurope.us" site_id="410">Bloomberg TV Europe</channel>
     <channel lang="fr" xmltv_id="BoingFrance.fr" site_id="924">Boing France</channel>
     <channel lang="fr" xmltv_id="BoomerangFrance.fr" site_id="321">Boomerang France</channel>
-    <channel lang="fr" xmltv_id="BoomerangFrancePlus1.us" site_id="928">Boomerang France +1</channel>
+    <channel lang="fr" xmltv_id="BoomerangFrancePlus1.fr" site_id="928">Boomerang France +1</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="445">C8</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="32">Canal J</channel>
     <channel lang="fr" xmltv_id="CanalPlusCinemaFrance.fr" site_id="33">Canal + Cinéma France</channel>
@@ -125,7 +125,7 @@
     <channel lang="fr" xmltv_id="MezzoLiveHD.fr" site_id="907">Mezzo Live HD</channel>
     <channel lang="fr" xmltv_id="MTVFrance.fr" site_id="128">MTV France</channel>
     <channel lang="fr" xmltv_id="MTVHitsFrance.fr" site_id="2006">MTV Hits France</channel>
-    <channel lang="fr" xmltv_id="Museum.fr" site_id="1072">Museum</channel>
+    <channel lang="fr" xmltv_id="MuseumTV.fr" site_id="1072">Museum</channel>
     <channel lang="fr" xmltv_id="MyZenTV.fr" site_id="829">MyZen TV</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.fr" site_id="508">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.fr" site_id="719">National Geographic Wild France</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index 1a883561..95beaa98 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="A2ZChannel11.ph" site_id="a2z-channel-11">A2Z Channel 11</channel>
     <channel lang="en" xmltv_id="ANC.ph" site_id="anc">ANC</channel>
     <channel lang="en" xmltv_id="AnimaxPhilippines.ph" site_id="animax">Animax</channel>
-    <channel lang="en" xmltv_id="AXNPhilippines.ph" site_id="axn">AXN</channel>
+    <channel lang="en" xmltv_id="AXNAsia.sg" site_id="axn">AXN</channel>
     <channel lang="en" xmltv_id="CelestialMoviesPinoy.hk" site_id="celestial-movies-pinoy">Celestial Movies Pinoy</channel>
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="cinema-one">Cinema One</channel>
     <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="cinemax">Cinemax</channel>
diff --git a/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
index a229a31e..8b8eab6d 100644
--- a/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
+++ b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
@@ -73,7 +73,7 @@
     <channel lang="es" xmltv_id="TVPeruInternacional.pe" site_id="TNP">TV Perú Internacional</channel>
     <channel lang="es" xmltv_id="TyCSportsInternacional.ar" site_id="TyC Sports">TyC Sports Internacional</channel>
     <channel lang="es" xmltv_id="UnitelSantaCruz.bo" site_id="Unitel (13)">Unitel Santa Cruz</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatina.us" site_id="Universal">Universal TV América Latina</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="Universal">Universal TV América Latina</channel>
     <channel lang="es" xmltv_id="VH1USEast.us" site_id="Vh1">VH1 East</channel>
     <channel lang="es" xmltv_id="WarnerChannelAtlanticoSur.us" site_id="Warner Channel">Warner Channel Atlántico Sur</channel>
   </channels>
diff --git a/sites/cosmote.gr/cosmote.gr_gr.channels.xml b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
index 156b2825..852b1092 100644
--- a/sites/cosmote.gr/cosmote.gr_gr.channels.xml
+++ b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
@@ -7,7 +7,7 @@
     <channel lang="el" xmltv_id="Alarabiya.ae" site_id="al-arabiya">Alarabiya</channel>
     <channel lang="el" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera">Aljazeera English</channel>
     <channel lang="el" xmltv_id="AlphaTV.gr" site_id="alpha">Alpha TV</channel>
-    <channel lang="el" xmltv_id="Ant1.gr" site_id="ant1">Ant1</channel>
+    <channel lang="el" xmltv_id="ANT1.gr" site_id="ant1">Ant1</channel>
     <channel lang="el" xmltv_id="BabyTVEurope.uk" site_id="baby-tv">Baby TV Europe</channel>
     <channel lang="el" xmltv_id="BBCEarthGreece.gr" site_id="bbc-earth-hd">BBC Earth Greece</channel>
     <channel lang="el" xmltv_id="BBCWorldNewsEurope.uk" site_id="bbc-world-news">BBC World News Europe</channel>
@@ -37,7 +37,7 @@
     <channel lang="el" xmltv_id="DWEnglish.de" site_id="deutsche-welle">DW English</channel>
     <channel lang="el" xmltv_id="EDGEsport.uk" site_id="edgesport-hd">Edge Sport</channel>
     <channel lang="el" xmltv_id="EEurope.us" site_id="e-hd">E! Europe</channel>
-    <channel lang="el" xmltv_id="EnaChannel.gr" site_id="tv100">Ena Channel</channel>
+    <channel lang="el" xmltv_id="ENAChannel.gr" site_id="tv100">Ena Channel</channel>
     <channel lang="el" xmltv_id="EpsilonTV.gr" site_id="zoom-tv">Epsilon TV</channel>
     <channel lang="el" xmltv_id="ERT1.gr" site_id="ert1">ERT 1</channel>
     <channel lang="el" xmltv_id="ERT2.gr" site_id="ert2">ERT 2</channel>
@@ -72,7 +72,7 @@
     <channel lang="el" xmltv_id="PrivateTV.nl" site_id="private-tv">Private TV</channel>
     <channel lang="el" xmltv_id="RTNews.ru" site_id="russia-today">RT News</channel>
     <channel lang="el" xmltv_id="SirinaTV.gr" site_id="sirina-tv">Sirina TV</channel>
-    <channel lang="el" xmltv_id="SKAI.gr" site_id="skai">SKAÏ</channel>
+    <channel lang="el" xmltv_id="SkaiTV.gr" site_id="skai">SKAÏ</channel>
     <channel lang="el" xmltv_id="SmileTV.gr" site_id="smile-tv">Smile TV</channel>
     <channel lang="el" xmltv_id="StarChannel.gr" site_id="star">Star Channel</channel>
     <channel lang="el" xmltv_id="StarKentrikisElladas.gr" site_id="star-kentrikes-elladas">Star Kentrikis Elladas</channel>
diff --git a/sites/gatotv.com/gatotv.com_bo.channels.xml b/sites/gatotv.com/gatotv.com_bo.channels.xml
index 48d830cf..910146ed 100644
--- a/sites/gatotv.com/gatotv.com_bo.channels.xml
+++ b/sites/gatotv.com/gatotv.com_bo.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="es" xmltv_id="AELatinAmerica.us" site_id="a_y_e_bolivia">A&amp;E Latinoamérica</channel>
     <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_bolivia">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_bolivia">Animal Planet Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AXNAndina.us" site_id="axn_bolivia">AXN Andina</channel>
+    <channel lang="es" xmltv_id="AXNLatinAmerica.us" site_id="axn_bolivia">AXN Andina</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_bolivia">Boomerang Latin America</channel>
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_bolivia">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_bolivia">Cinecanal Oeste</channel>
@@ -31,7 +31,7 @@
     <channel lang="es" xmltv_id="TelemundoInternacional.us" site_id="telemundo_bolivia">Telemundo Internacional</channel>
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_bolivia">TLC Latinoamérica</channel>
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_bolivia">TNT América Latina</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_bolivia">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_bolivia">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_bolivia">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_bolivia">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_co.channels.xml b/sites/gatotv.com/gatotv.com_co.channels.xml
index d0c6226b..b69b9453 100644
--- a/sites/gatotv.com/gatotv.com_co.channels.xml
+++ b/sites/gatotv.com/gatotv.com_co.channels.xml
@@ -15,7 +15,7 @@
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_colombia">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_colombia">Cinemax Latinoamérica</channel>
     <channel lang="es" xmltv_id="CitytvBogota.co" site_id="city_tv">City TV</channel>
-    <channel lang="es" xmltv_id="ClaromusicaTV.co" site_id="claro_musica">Claro música TV</channel>
+    <channel lang="es" xmltv_id="ClaroMusicaTV.co" site_id="claro_musica">Claro música TV</channel>
     <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_colombia">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_colombia">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_colombia">Discovery Home &amp; Health Latinoamérica</channel>
diff --git a/sites/gatotv.com/gatotv.com_cr.channels.xml b/sites/gatotv.com/gatotv.com_cr.channels.xml
index b814297f..a164d204 100644
--- a/sites/gatotv.com/gatotv.com_cr.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cr.channels.xml
@@ -43,7 +43,7 @@
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_costa_rica">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_costa_rica">TNT Series Argentina</channel>
     <channel lang="es" xmltv_id="TreceCostaRicaTV.cr" site_id="13_de_costa_rica">Trece Costa Rica TV</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatina.us" site_id="universal_tv_costa_rica">Universal TV América Latina</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_costa_rica">Universal TV América Latina</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_costa_rica">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_costa_rica">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_do.channels.xml b/sites/gatotv.com/gatotv.com_do.channels.xml
index 3443c636..ea02c57c 100644
--- a/sites/gatotv.com/gatotv.com_do.channels.xml
+++ b/sites/gatotv.com/gatotv.com_do.channels.xml
@@ -45,7 +45,7 @@
     <channel lang="es" xmltv_id="TCMAmericaLatina.us" site_id="tcm_republica_dominicana">TCM América Latina</channel>
     <channel lang="es" xmltv_id="TeleAntillas.do" site_id="2_de_republica_dominicana_teleantillas">Tele Antillas</channel>
     <channel lang="es" xmltv_id="Telecentro.do" site_id="13_de_republica_dominicana_telecentro">Telecentro</channel>
-    <channel lang="es" xmltv_id="Telemicro5.do" site_id="5_de_republica_dominicana_telemicro">Telemicro 5</channel>
+    <channel lang="es" xmltv_id="Telemicro.do" site_id="5_de_republica_dominicana_telemicro">Telemicro 5</channel>
     <channel lang="es" xmltv_id="TelemundoInternacional.us" site_id="telemundo_republica_dominicana">Telemundo Internacional</channel>
     <channel lang="es" xmltv_id="Telesistema.do" site_id="telesistema_11">Telesistema</channel>
     <channel lang="es" xmltv_id="Teleunion.do" site_id="teleunion_republica_dominicana">Teleunion</channel>
@@ -54,7 +54,7 @@
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_republica_dominicana">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_republica_dominicana">TNT Series Argentina</channel>
     <channel lang="es" xmltv_id="TVDominicana.us" site_id="tv_dominicana">TV Dominicana</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_republica_dominicana">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_republica_dominicana">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_republica_dominicana">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_republica_dominicana">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_ec.channels.xml b/sites/gatotv.com/gatotv.com_ec.channels.xml
index 907d7ca7..320fa55c 100644
--- a/sites/gatotv.com/gatotv.com_ec.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ec.channels.xml
@@ -35,11 +35,11 @@
     <channel lang="es" xmltv_id="SyfyLatinAmerica.us" site_id="syfy_ecuador">Syfy Latin</channel>
     <channel lang="es" xmltv_id="TBSAmericaLatina.us" site_id="tbs_ecuador">TBS América Latina</channel>
     <channel lang="es" xmltv_id="TCMAmericaLatina.us" site_id="tcm_ecuador">TCM América Latina</channel>
-    <channel lang="es" xmltv_id="TeleAmazonas.ec" site_id="teleamazonas">TeleAmazonas</channel>
+    <channel lang="es" xmltv_id="Teleamazonas.ec" site_id="teleamazonas">TeleAmazonas</channel>
     <channel lang="es" xmltv_id="TelemundoInternacional.us" site_id="telemundo_ecuador">Telemundo Internacional</channel>
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_ecuador">TLC Latinoamérica</channel>
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_ecuador">TNT América Latina</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_ecuador">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_ecuador">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_ecuador">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_ecuador">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index 00e469e4..47700f2d 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -28,8 +28,8 @@
     <channel lang="es" xmltv_id="ETB2.es" site_id="etb_2">ETB 2</channel>
     <channel lang="es" xmltv_id="Eurosport1.fr" site_id="eurosport_1_espana">Eurosport 1</channel>
     <channel lang="es" xmltv_id="Eurosport2.fr" site_id="eurosport_2_espana">Eurosport 2</channel>
-    <channel lang="es" xmltv_id="FoxSpain.us" site_id="fox_espana">Fox España</channel>
-    <channel lang="es" xmltv_id="FoxLifeSpain.us" site_id="fox_life_espana">Fox Life España</channel>
+    <channel lang="es" xmltv_id="FoxSpain.es" site_id="fox_espana">Fox España</channel>
+    <channel lang="es" xmltv_id="FoxLifeSpain.es" site_id="fox_life_espana">Fox Life España</channel>
     <channel lang="es" xmltv_id="GaliciaTVEuropa.es" site_id="galicia_tv">Galicia TV Europa</channel>
     <channel lang="es" xmltv_id="Gol.es" site_id="gol_espana">Gol</channel>
     <channel lang="es" xmltv_id="HistoriaSpain.us" site_id="historia_espana">Historia España</channel>
@@ -49,11 +49,11 @@
     <channel lang="es" xmltv_id="StingrayClassica.ca" site_id="classica">Stingray Classica</channel>
     <channel lang="es" xmltv_id="SundanceTVSpain.us" site_id="sundance_tv_espana">Sundance TV España</channel>
     <channel lang="es" xmltv_id="SyfySpain.us" site_id="syfy_espana">Syfy España</channel>
-    <channel lang="es" xmltv_id="TCMSpain.us" site_id="tcm_espana">TCM España</channel>
+    <channel lang="es" xmltv_id="TCMSpain.es" site_id="tcm_espana">TCM España</channel>
     <channel lang="es" xmltv_id="Telecinco.es" site_id="telecinco">Telecinco</channel>
     <channel lang="es" xmltv_id="Teledeporte.es" site_id="teledeporte">Teledeporte</channel>
     <channel lang="es" xmltv_id="Telemadrid.es" site_id="telemadrid">Telemadrid</channel>
-    <channel lang="es" xmltv_id="TNTSpain.us" site_id="tnt_espana">TNT España</channel>
+    <channel lang="es" xmltv_id="TNTSpain.es" site_id="tnt_espana">TNT España</channel>
     <channel lang="es" xmltv_id="TVCanaria.es" site_id="television_canaria">TV Canaria</channel>
     <channel lang="es" xmltv_id="TVCastillaLaMancha.es" site_id="castilla-la_mancha">TV Castilla-La Mancha</channel>
     <channel lang="es" xmltv_id="La1.es" site_id="la_1">TVE La 1 Madrid</channel>
diff --git a/sites/gatotv.com/gatotv.com_gt.channels.xml b/sites/gatotv.com/gatotv.com_gt.channels.xml
index afade649..c6731956 100644
--- a/sites/gatotv.com/gatotv.com_gt.channels.xml
+++ b/sites/gatotv.com/gatotv.com_gt.channels.xml
@@ -48,7 +48,7 @@
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_guatemala">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesMexico.mx" site_id="tnt_series_guatemala">TNT Series México</channel>
     <channel lang="es" xmltv_id="TreceVision.gt" site_id="13_de_guatemala_trecevision">TreceVision</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatina.us" site_id="universal_tv_guatemala">Universal TV América Latina</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_guatemala">Universal TV América Latina</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_guatemala">Warner Channel Panregional</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/gatotv.com/gatotv.com_hn.channels.xml b/sites/gatotv.com/gatotv.com_hn.channels.xml
index e00ba2b9..3f536073 100644
--- a/sites/gatotv.com/gatotv.com_hn.channels.xml
+++ b/sites/gatotv.com/gatotv.com_hn.channels.xml
@@ -43,7 +43,7 @@
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_honduras">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_honduras">TNT Series Argentina</channel>
     <channel lang="es" xmltv_id="TSi.hn" site_id="tsi_honduras">TSi</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_honduras">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_honduras">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_honduras">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="VTV.hn" site_id="9_de_honduras_vica">VTV</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_honduras">Warner Channel Panregional</channel>
diff --git a/sites/gatotv.com/gatotv.com_mx.channels.xml b/sites/gatotv.com/gatotv.com_mx.channels.xml
index 84811dda..03c74d81 100644
--- a/sites/gatotv.com/gatotv.com_mx.channels.xml
+++ b/sites/gatotv.com/gatotv.com_mx.channels.xml
@@ -20,7 +20,7 @@
     <channel lang="es" xmltv_id="AztecaUnoPlus2.mx" site_id="azteca_uno_2h">Azteca Uno +2</channel>
     <channel lang="es" xmltv_id="Bandamax.mx" site_id="bandamax">Bandamax</channel>
     <channel lang="es" xmltv_id="BitMe.mx" site_id="bitme">BitMe</channel>
-    <channel lang="es" xmltv_id="BoomerangMexico.us" site_id="boomerang_mexico">Boomerang México</channel>
+    <channel lang="es" xmltv_id="BoomerangMexico.mx" site_id="boomerang_mexico">Boomerang México</channel>
     <channel lang="es" xmltv_id="Canal5.mx" site_id="5_mexico">Canal 5</channel>
     <channel lang="es" xmltv_id="Canal22Nacional.mx" site_id="22_mexico">Canal 22 Nacional</channel>
     <channel lang="es" xmltv_id="CanalCatorce.mx" site_id="14_de_mexico">Canal Catorce</channel>
@@ -95,7 +95,7 @@
     <channel lang="es" xmltv_id="TNTSeriesMexico.mx" site_id="tnt_series_mexico">TNT Series México</channel>
     <channel lang="es" xmltv_id="TUDNMexico.mx" site_id="tudn_mexico">TUDN México</channel>
     <channel lang="es" xmltv_id="TVMexiquense.mx" site_id="mexiquense_tv">TV Méxiquense</channel>
-    <channel lang="es" xmltv_id="TVUnam.mx" site_id="tvunam">TV UNAM</channel>
+    <channel lang="es" xmltv_id="TVUNAM.mx" site_id="tvunam">TV UNAM</channel>
     <channel lang="es" xmltv_id="Unicable.mx" site_id="unicable">Unicable</channel>
     <channel lang="es" xmltv_id="UniversalTVMexico.mx" site_id="universal_tv_mexico">Universal TV México</channel>
     <channel lang="es" xmltv_id="VibraTV.mx" site_id="vibra_tv">Vibra TV</channel>
diff --git a/sites/gatotv.com/gatotv.com_ni.channels.xml b/sites/gatotv.com/gatotv.com_ni.channels.xml
index c4a08c7e..a2e78b5d 100644
--- a/sites/gatotv.com/gatotv.com_ni.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ni.channels.xml
@@ -43,7 +43,7 @@
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_nicaragua">TLC Latinoamérica</channel>
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_nicaragua">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_nicaragua">TNT Series Argentina</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_nicaragua">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_nicaragua">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_nicaragua">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="VivaNicaraguaCanal13.ni" site_id="13_de_nicaragua">Viva Nicaragua Canal 13</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_nicaragua">Warner Channel Panregional</channel>
diff --git a/sites/gatotv.com/gatotv.com_pa.channels.xml b/sites/gatotv.com/gatotv.com_pa.channels.xml
index c51801f1..f8132e76 100644
--- a/sites/gatotv.com/gatotv.com_pa.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pa.channels.xml
@@ -46,7 +46,7 @@
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_panama">TNT Series Argentina</channel>
     <channel lang="es" xmltv_id="TVMax.pa" site_id="tvmax">TV Max</channel>
     <channel lang="es" xmltv_id="TVN.pa" site_id="2_de_panama">TVN</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_panama">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_panama">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_panama">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_panama">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_pe.channels.xml b/sites/gatotv.com/gatotv.com_pe.channels.xml
index 588fd7d6..11b1a1a2 100644
--- a/sites/gatotv.com/gatotv.com_pe.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pe.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="es" xmltv_id="AELatinAmerica.us" site_id="a_y_e_peru">A&amp;E Latinoamérica</channel>
     <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_peru">AMC Latin America</channel>
-    <channel lang="es" xmltv_id="America.pe" site_id="america_television_peru">América</channel>
+    <channel lang="es" xmltv_id="AmericaTelevision.pe" site_id="america_television_peru">América</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_peru">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="ATV.pe" site_id="atv">ATV</channel>
     <channel lang="es" xmltv_id="AXNLatinAmerica.us" site_id="axn_peru">AXN Latinoamérica</channel>
@@ -41,7 +41,7 @@
     <channel lang="es" xmltv_id="TelemundoInternacional.us" site_id="telemundo_peru">Telemundo Internacional</channel>
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_peru">TLC Latinoamérica</channel>
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_peru">TNT América Latina</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_peru">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_peru">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_peru">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_peru">Warner Channel Panregional</channel>
     <channel lang="es" xmltv_id="WillaxTV.pe" site_id="willax_tv">Willax TV</channel>
diff --git a/sites/gatotv.com/gatotv.com_sv.channels.xml b/sites/gatotv.com/gatotv.com_sv.channels.xml
index 60454c9f..1c7f941d 100644
--- a/sites/gatotv.com/gatotv.com_sv.channels.xml
+++ b/sites/gatotv.com/gatotv.com_sv.channels.xml
@@ -46,7 +46,7 @@
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_el_salvador">TLC Latinoamérica</channel>
     <channel lang="es" xmltv_id="TNTAmericaLatina.us" site_id="tnt_el_salvador">TNT América Latina</channel>
     <channel lang="es" xmltv_id="TNTSeriesArgentina.ar" site_id="tnt_series_el_salvador">TNT Series Argentina</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_el_salvador">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_el_salvador">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="UnivisionLatinAmerica.us" site_id="univision_el_salvador">Univisión Latinoamérica</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="warner_tv_el_salvador">Warner Channel Panregional</channel>
   </channels>
diff --git a/sites/gatotv.com/gatotv.com_ve.channels.xml b/sites/gatotv.com/gatotv.com_ve.channels.xml
index 94aa21c9..8109433d 100644
--- a/sites/gatotv.com/gatotv.com_ve.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ve.channels.xml
@@ -33,6 +33,6 @@
     <channel lang="es" xmltv_id="TCMAmericaLatina.us" site_id="tcm_venezuela">TCM América Latina</channel>
     <channel lang="es" xmltv_id="TelemundoInternacional.us" site_id="telemundo_venezuela">Telemundo Internacional</channel>
     <channel lang="es" xmltv_id="TLCLatinAmerica.us" site_id="tlc_venezuela">TLC Latinoamérica</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="universal_tv_venezuela">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="universal_tv_venezuela">Universal TV América Latina Oeste</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
index 713edfe8..8a9f37c5 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="it" xmltv_id="BloombergTVEurope.us" site_id="DTH#349">Bloomberg TV Europe</channel>
     <channel lang="it" xmltv_id="BoingItaly.it" site_id="DTH#6628">Boing Italia</channel>
     <channel lang="it" xmltv_id="BoomerangItaly.it" site_id="DTH#472">Boomerang Italia</channel>
-    <channel lang="it" xmltv_id="BoomerangPlus1Italy.it" site_id="DTH#479">Boomerang Italia +1</channel>
+    <channel lang="it" xmltv_id="BoomerangItalyPlus1.it" site_id="DTH#479">Boomerang Italia +1</channel>
     <channel lang="it" xmltv_id="Caccia.it" site_id="DTH#520">Caccia</channel>
     <channel lang="it" xmltv_id="Canale5.it" site_id="DTH#10354">Canale 5</channel>
     <channel lang="it" xmltv_id="CartoonitoItaly.it" site_id="DTH#8132">Cartoonito Italia</channel>
@@ -84,7 +84,7 @@
     <channel lang="it" xmltv_id="QVCItaly.it" site_id="DTH#6626">QVC Italia</channel>
     <channel lang="it" xmltv_id="RadioFrecciaTV.it" site_id="DTH#10616">Radio Freccia TV</channel>
     <channel lang="it" xmltv_id="RadioItaliaTV.it" site_id="DTH#9833">Radio Italia TV</channel>
-    <channel lang="it" xmltv_id="RadioMonteCarloTV.it" site_id="DTH#10993">Radio Monte Carlo TV</channel>
+    <channel lang="it" xmltv_id="RadioMonteCarlo.it" site_id="DTH#10993">Radio Monte Carlo TV</channel>
     <channel lang="it" xmltv_id="RadionorbaTV.it" site_id="DTH#8213">Radionorba TV</channel>
     <channel lang="it" xmltv_id="Rai1.it" site_id="DTH#899">Rai 1</channel>
     <channel lang="it" xmltv_id="Rai2.it" site_id="DTH#898">Rai 2</channel>
@@ -129,11 +129,11 @@
     <channel lang="it" xmltv_id="SkySport2.it" site_id="DTH#9045">Sky Sport 2</channel>
     <channel lang="it" xmltv_id="SkySport24.it" site_id="DTH#929">Sky Sport 24</channel>
     <channel lang="it" xmltv_id="SkySport3.it" site_id="DTH#9049">Sky Sport 3</channel>
-    <channel lang="it" xmltv_id="SkySport4.it" site_id="DTH#9040">Sky Sport 4</channel>
-    <channel lang="it" xmltv_id="SkySport5.it" site_id="DTH#9038">Sky Sport 5</channel>
-    <channel lang="it" xmltv_id="SkySport6.it" site_id="DTH#9041">Sky Sport 6</channel>
-    <channel lang="it" xmltv_id="SkySport7.it" site_id="DTH#9033">Sky Sport 7</channel>
-    <channel lang="it" xmltv_id="SkySport8.it" site_id="DTH#9048">Sky Sport 8</channel>
+    <channel lang="it" xmltv_id="SkySport4HD.it" site_id="DTH#9040">Sky Sport 4</channel>
+    <channel lang="it" xmltv_id="SkySport5HD.it" site_id="DTH#9038">Sky Sport 5</channel>
+    <channel lang="it" xmltv_id="SkySport6HD.it" site_id="DTH#9041">Sky Sport 6</channel>
+    <channel lang="it" xmltv_id="SkySport7HD.it" site_id="DTH#9033">Sky Sport 7</channel>
+    <channel lang="it" xmltv_id="SkySport8HD.it" site_id="DTH#9048">Sky Sport 8</channel>
     <channel lang="it" xmltv_id="SkySport9.it" site_id="DTH#9046">Sky Sport 9</channel>    
     <channel lang="it" xmltv_id="SkySportArena.it" site_id="DTH#7507">Sky Sport Arena</channel>
     <channel lang="it" xmltv_id="SkySportF1.it" site_id="DTH#9096">Sky Sport F1</channel>
diff --git a/sites/hd-plus.de/hd-plus.de_de.channels.xml b/sites/hd-plus.de/hd-plus.de_de.channels.xml
index 6858bc7a..e478de05 100644
--- a/sites/hd-plus.de/hd-plus.de_de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de_de.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="de" xmltv_id="ATV.at" site_id="atv-hd">ATV</channel>
     <channel lang="de" xmltv_id="ATV2.at" site_id="atv2">ATV 2</channel>
     <channel lang="de" xmltv_id="AugsburgTV.de" site_id="a-tv">Augsburg TV</channel>
-    <channel lang="de" xmltv_id="AXNGermany.us" site_id="axn-hd">AXN Deutschland</channel>
+    <channel lang="de" xmltv_id="AXNGermany.de" site_id="axn-hd">AXN Deutschland</channel>
     <channel lang="de" xmltv_id="BRFernsehenNord.de" site_id="bayerisches-fernsehen-hd">Bayerisches Fernsehen Nord</channel>
     <channel lang="de" xmltv_id="BibelTV.de" site_id="bibel-tv-hd">Bibel TV</channel>
     <channel lang="de" xmltv_id="BloombergTVEurope.us" site_id="bloomberg-tv-europe">Bloomberg TV Europe</channel>
@@ -38,7 +38,7 @@
     <channel lang="de" xmltv_id="HRFernsehen.de" site_id="hr-fernsehen-hd">HR Fernsehen</channel>
     <channel lang="de" xmltv_id="HSE.de" site_id="hse24-hd">HSE</channel>
     <channel lang="de" xmltv_id="HSEExtra.de" site_id="hse24-extra-hd">HSE Extra</channel>
-    <channel lang="de" xmltv_id="JMLDirect.uk" site_id="jml">JML Direct</channel>
+    <channel lang="de" xmltv_id="JMLDirectTV.uk" site_id="jml">JML Direct</channel>
     <channel lang="de" xmltv_id="Junior.de" site_id="junior">Junior</channel>
     <channel lang="de" xmltv_id="Juwelo.de" site_id="juwelo-hd">Juwelo</channel>
     <channel lang="de" xmltv_id="kabeleinsclassics.de" site_id="kabel-eins-classics">Kabel Eins Classics</channel>
@@ -104,15 +104,15 @@
     <channel lang="de" xmltv_id="SportdigitalFussball.de" site_id="sportdigital">Sportdigital Fussball</channel>
     <channel lang="de" xmltv_id="SRF1.ch" site_id="srf-1-hd">SRF 1</channel>
     <channel lang="de" xmltv_id="SRFernsehen.de" site_id="sr-fernsehen-hd">SR Fernsehen</channel>
-    <channel lang="de" xmltv_id="SRFZwei.ch" site_id="srf-zwei-hd">SRF Zwei</channel>
+    <channel lang="de" xmltv_id="SRFzwei.ch" site_id="srf-zwei-hd">SRF Zwei</channel>
     <channel lang="de" xmltv_id="StingrayClassica.ca" site_id="classica">Stingray Classica</channel>
     <channel lang="de" xmltv_id="SuperRTLGermany.de" site_id="super-rtl-hd">Super RTL Deutschland</channel>
     <channel lang="de" xmltv_id="SyfyGermany.us" site_id="syfy-hd">Syfy Deutschland</channel>
     <channel lang="de" xmltv_id="tagesschau24.de" site_id="tagesschau24-hd">Tagesschau 24</channel>
     <channel lang="de" xmltv_id="Tele5.de" site_id="tele-5-hd">Tele 5</channel>
     <channel lang="de" xmltv_id="TLCGermany.de" site_id="tlc-hd">TLC Germany</channel>
-    <channel lang="de" xmltv_id="TNTFilm.us" site_id="tnt-film">TNT Film</channel>
-    <channel lang="de" xmltv_id="TNTSerie.us" site_id="tnt-serie-hd">TNT Serie</channel>
+    <channel lang="de" xmltv_id="TNTFilm.de" site_id="tnt-film">TNT Film</channel>
+    <channel lang="de" xmltv_id="TNTSerie.de" site_id="tnt-serie-hd">TNT Serie</channel>
     <channel lang="de" xmltv_id="TVAOstbayern.de" site_id="tva-ostbayern">TVA Ostbayern</channel>
     <channel lang="de" xmltv_id="TVOberfranken.de" site_id="tv-oberfranken">TV Oberfranken</channel>
     <channel lang="de" xmltv_id="UniversalTVGermany.us" site_id="universal-channel-hd">Universal TV Deutschland</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index 6029724c..f32a97ec 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="de" xmltv_id="BibelTV.de" site_id="Bibel_TV">Bibel TV</channel>
     <channel lang="de" xmltv_id="Bild.de" site_id="SV_09999_33108">BILD HD</channel>
     <channel lang="de" xmltv_id="BloombergTVEurope.us" site_id="SV_09999_14130">Bloomberg</channel>
-    <channel lang="de" xmltv_id="BNTVSatelitski.ba" site_id="SV_09999_59102">BN TV</channel>
+    <channel lang="de" xmltv_id="BNTV.ba" site_id="SV_09999_59102">BN TV</channel>
     <channel lang="de" xmltv_id="BoomerangGermany.de" site_id="Boomerang_(D)">Boomerang</channel>
     <channel lang="de" xmltv_id="BRFernsehenNord.de" site_id="Bayerisches_FS_Nord">BR Fernsehen Nord</channel>
     <channel lang="de" xmltv_id="BRFernsehenSud.de" site_id="Bayerisches_FS_Sud">BR Fernsehen Süd</channel>
diff --git a/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml b/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
index 4eb88f71..997fbda5 100644
--- a/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
+++ b/sites/i.mjh.nz/i.mjh.nz_us-pluto.channels.xml
@@ -297,7 +297,7 @@
     <channel lang="en" xmltv_id="ThisOldHouse.us" site_id="PlutoTV/us#5d51e791b7dba3b2ae990ab2">This Old House</channel>
     <channel lang="en" xmltv_id="ThreesCompany.us" site_id="PlutoTV/us#5ef3977e5d773400077de284">Three&apos;s Company</channel>
     <channel lang="en" xmltv_id="TinyHouseNation.us" site_id="PlutoTV/us#601a0342dcf4370007566891">Tiny House Nation</channel>
-    <channel lang="en" xmltv_id="TodayAD.us" site_id="PlutoTV/us#5d695f7db53adf96b78e7ce3">TODAY All Day</channel>
+    <channel lang="en" xmltv_id="TodayAllDay.us" site_id="PlutoTV/us#5d695f7db53adf96b78e7ce3">TODAY All Day</channel>
     <channel lang="en" xmltv_id="TokuSHOUTsu.us" site_id="PlutoTV/us#5c3f8f12a93c2d61b9990a4e">TokuSHOUTsu</channel>
     <channel lang="en" xmltv_id="TopGearenEspanol.us" site_id="PlutoTV/us#61325566b3c86a00078e4819">Top Gear en español</channel>
     <channel lang="en" xmltv_id="Tosh0.us" site_id="PlutoTV/us#5dae084727c8af0009fe40a4">Tosh.0</channel>
@@ -314,7 +314,7 @@
     <channel lang="en" xmltv_id="VevoLatino.us" site_id="PlutoTV/us#5da0d64d0e8a62000964ebe4">Vevo Latino</channel>
     <channel lang="en" xmltv_id="VevoPop.us" site_id="PlutoTV/us#5d93b635b43dd1a399b39eee">Vevo Pop</channel>
     <channel lang="en" xmltv_id="VevoRB.us" site_id="PlutoTV/us#5da0d83f66c9700009b96d0e">Vevo R&amp;B</channel>
-    <channel lang="en" xmltv_id="VevoReggeatonTrap.us" site_id="PlutoTV/us#5f32f397795b750007706448">Vevo Reggaetón &amp; Trap</channel>
+    <channel lang="en" xmltv_id="VevoReggaetonTrap.us" site_id="PlutoTV/us#5f32f397795b750007706448">Vevo Reggaetón &amp; Trap</channel>
     <channel lang="en" xmltv_id="VevoRetroRock.us" site_id="PlutoTV/us#61d4b38226b8a50007fe03a6">Vevo Retro Rock</channel>
     <channel lang="en" xmltv_id="VevoTrueSchoolHipHop.us" site_id="PlutoTV/us#61d4c2817a823d00070ba53e">Vevo True School Hip-Hop</channel>
     <channel lang="en" xmltv_id="VH1HipHopFamily.us" site_id="PlutoTV/us#5d71561df6f2e6d0b6493bf5">VH1 Hip Hop Family</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index 1db652fe..f8c6a595 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -10,8 +10,7 @@
     <channel lang="cz" xmltv_id="5Kanal.ua" site_id="5+Kanal">5 Kanal</channel>
     <channel lang="cz" xmltv_id="7D7.ee" site_id="7D7TV">7D7</channel>
     <channel lang="cz" xmltv_id="8KanalInternational.ru" site_id="8TV">8 Kanal International</channel>
-    <channel lang="cz" xmltv_id="Adventure.pl" site_id="Adventure+TV+%28pl%29">Adventure</channel>
-    <channel lang="cz" xmltv_id="AdventureCzechia.pl" site_id="Adventure+TV">Adventure Czechia</channel>
+    <channel lang="cz" xmltv_id="AdventureTV.pl" site_id="Adventure+TV+%28pl%29">Adventure</channel>
     <channel lang="cz" xmltv_id="AlibiIreland.ie" site_id="Alibi+SD+Ireland">Alibi Ireland</channel>
     <channel lang="cz" xmltv_id="AlJazeeraBalkans.qa" site_id="Al+Jazeera+Balkans">Aljazeera Balkans</channel>
     <channel lang="cz" xmltv_id="AlJazeeraChannel.qa" site_id="Aljazeera+%28Arabic%29">Aljazeera Channel</channel>
@@ -44,7 +43,7 @@
     <channel lang="cz" xmltv_id="Biznes24.pl" site_id="Biznes24">Biznes 24</channel>
     <channel lang="cz" xmltv_id="BloombergTVEurope.us" site_id="Bloomberg">Bloomberg TV Europe</channel>
     <channel lang="cz" xmltv_id="BlueHustler.uk" site_id="Blue+Hustler">Blue Hustler Europe</channel>
-    <channel lang="cz" xmltv_id="BNTVSatelitski.ba" site_id="BN+Televizija">BN TV Satelitski</channel>
+    <channel lang="cz" xmltv_id="BNTV.ba" site_id="BN+Televizija">BN TV Satelitski</channel>
     <channel lang="cz" xmltv_id="BoberInternational.ru" site_id="Bober">Bober International</channel>
     <channel lang="cz" xmltv_id="BodyinBalanceUK.uk" site_id="B+in+Balance">Body in Balance UK</channel>
     <channel lang="cz" xmltv_id="BoomerangCentralEasternEurope.us" site_id="Boomerang">Boomerang Central &amp; Eastern Europe</channel>
@@ -238,7 +237,7 @@
     <channel lang="cz" xmltv_id="More4UK.uk" site_id="More+4">More 4 UK</channel>
     <channel lang="cz" xmltv_id="MovistarAccion.es" site_id="Canal%2B+Accion+HD">Movistar Acción</channel>
     <channel lang="cz" xmltv_id="MovistarComedia.es" site_id="Canal%2B+Comedia+HD">Movistar Comedia</channel>
-    <channel lang="cz" xmltv_id="MovistarDeportes.pe" site_id="Canal%2B+Deportes+HD">Movistar Deportes</channel>
+    <channel lang="cz" xmltv_id="MovistarDeportesPeru.pe" site_id="Canal%2B+Deportes+HD">Movistar Deportes</channel>
     <channel lang="cz" xmltv_id="MovistarDrama.es" site_id="Canal%2B+DCine+HD">Movistar Drama</channel>
     <channel lang="cz" xmltv_id="MovistarEstrenos.es" site_id="Canal%2B+Estrenos+HD">Movistar Estrenos</channel>
     <channel lang="cz" xmltv_id="MovistarGolf.es" site_id="Canal%2B+Golf+HD">Movistar Golf</channel>
@@ -349,7 +348,7 @@
     <channel lang="cz" xmltv_id="RBBBerlin.de" site_id="RBB+Berlin">RBB Berlin</channel>
     <channel lang="cz" xmltv_id="RealityKingsTV.us" site_id="Reality+Kings+TV">Reality Kings TV</channel>
     <channel lang="cz" xmltv_id="Rebel.cz" site_id="Rebel">Rebel</channel>
-    <channel lang="cz" xmltv_id="RedCarpet.pl" site_id="Red+Carpet">Red Carpet</channel>
+    <channel lang="cz" xmltv_id="RedCarpetTV.pl" site_id="Red+Carpet">Red Carpet</channel>
     <channel lang="cz" xmltv_id="RedlightHD.nl" site_id="Redlight+HD">Redlight HD</channel>
     <channel lang="cz" xmltv_id="RegionalniTV.cz" site_id="regionalnitelevize.cz">Regionální TV</channel>
     <channel lang="cz" xmltv_id="Relax.cz" site_id="RELAX">Relax</channel>
@@ -471,14 +470,14 @@
     <channel lang="cz" xmltv_id="TVCGSat.me" site_id="TVCG+SAT">TVCG Sat</channel>
     <channel lang="cz" xmltv_id="TVDoma.sk" site_id="Doma">TV Doma</channel>
     <channel lang="cz" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="TVE">TVE Internacional Europa</channel>
-    <channel lang="cz" xmltv_id="TVJoj.sk" site_id="JOJ">TV Joj</channel>
+    <channel lang="cz" xmltv_id="TVJOJ.sk" site_id="JOJ">TV Joj</channel>
     <channel lang="cz" xmltv_id="TVLux.sk" site_id="Lux">TV Lux</channel>
     <channel lang="cz" xmltv_id="TVMarkiza.sk" site_id="Mark%EDza">TV Markíza</channel>
     <channel lang="cz" xmltv_id="TVN.pl" site_id="TVN">TVN</channel>
     <channel lang="cz" xmltv_id="TVN24.pl" site_id="TVN24">TVN 24</channel>
     <channel lang="cz" xmltv_id="TVN7.pl" site_id="TVN7">TVN 7</channel>
     <channel lang="cz" xmltv_id="TVNatura.cz" site_id="TV+Natura">TV Natura</channel>
-    <channel lang="cz" xmltv_id="TVNoe.cz" site_id="Noe">TV Noe</channel>
+    <channel lang="cz" xmltv_id="TVNOE.cz" site_id="Noe">TV Noe</channel>
     <channel lang="cz" xmltv_id="TVNova.cz" site_id="Nova">TV Nova</channel>
     <channel lang="cz" xmltv_id="TVNTurbo.pl" site_id="TVN+Turbo">TVN Turbo</channel>
     <channel lang="cz" xmltv_id="TVOsem.sk" site_id="TV8">TV Osem</channel>
diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index 9add56e9..dbe75eec 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="de" xmltv_id="HustlerTVEurope.uk" site_id="Hustler_TV">Hustler TV Europe</channel>
     <channel lang="de" xmltv_id="KIKA.de" site_id="KI_KA_HD">KIKA</channel>
     <channel lang="de" xmltv_id="kabeleinsAustria.at" site_id="kabel_eins_HD">Kabel Eins Austria</channel>
-    <channel lang="de" xmltv_id="KabelEinsDokuAustria.at" site_id="kabel_eins_classics_HD">Kabel Eins Classics</channel>
+    <channel lang="de" xmltv_id="kabeleinsDokuAustria.at" site_id="kabel_eins_classics_HD">Kabel Eins Classics</channel>
     <channel lang="de" xmltv_id="kabeleinsDoku.de" site_id="kabel_eins_Doku_HD">Kabel Eins Doku Austria</channel>
     <channel lang="de" xmltv_id="KinoweltTV.de" site_id="Kinowelt_TV_HD">Kinowelt TV HD</channel>
     <channel lang="de" xmltv_id="KroneTV.at" site_id="krone_tv_HD">Krone TV</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
index 2b589167..de169f8c 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
@@ -94,7 +94,6 @@
     <channel lang="hr" xmltv_id="NickJrCroatia.hr" site_id="429">Nick Jr</channel>
     <channel lang="hr" xmltv_id="NickMusicUS.us" site_id="269">NickMusic</channel>
     <channel lang="hr" xmltv_id="NicktoonsRomania.ro" site_id="364">Nicktoons România</channel>
-    <channel lang="hr" xmltv_id="NovaTV.hr" site_id="112">TV Nova</channel>
     <channel lang="hr" xmltv_id="NovaTV.hr" site_id="91">Nova TV</channel>
     <channel lang="hr" xmltv_id="NTVMir.ru" site_id="258">NTV Mir</channel>
     <channel lang="hr" xmltv_id="OTVValentino.ba" site_id="763">OTV Valentino</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index 59cde959..9b33b787 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -49,7 +49,7 @@
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="ar#discovery-home-and-health">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="ar#discovery-kids">Discovery Kids América Latina</channel>
     <channel lang="es" xmltv_id="DiscoveryScienceLatinAmerica.us" site_id="ar#discovery-science">Discovery Science Latinoamérica</channel>
-    <channel lang="es" xmltv_id="DiscoveryTheater.us" site_id="ar#discovery-hd-theater">Discovery Theater</channel>
+    <channel lang="es" xmltv_id="DiscoveryTheaterHD.us" site_id="ar#discovery-hd-theater">Discovery Theater</channel>
     <channel lang="es" xmltv_id="DiscoveryTurboAmericaLatina.us" site_id="ar#discovery-turbo">Discovery Turbo América Latina</channel>
     <channel lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="ar#disney">Disney Channel Sur</channel>
     <channel lang="es" xmltv_id="ELatinAmerica.us" site_id="ar#entertainment">E! Latinoamérica</channel>
@@ -105,7 +105,7 @@
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="ar#national-geographic">National Geographic Centro</channel>
     <channel lang="es" xmltv_id="NationalGeographicWildLatin.us" site_id="ar#nat-geo-wild">National Geographic Wild Latin</channel>
     <channel lang="es" xmltv_id="NBATVLatinAmerica.us" site_id="ar#nba-tv">NBA TV Latin America</channel>
-    <channel lang="es" xmltv_id="NetTV.ar" site_id="ar#net-tv">Net TV</channel>
+    <channel lang="es" xmltv_id="NETTV.ar" site_id="ar#net-tv">Net TV</channel>
     <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="ar#nickelodeon">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="ar#nick-jr">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="NicktoonsLatinAmerica.us" site_id="ar#nicktoons">Nicktoons Latin America</channel>
@@ -123,7 +123,7 @@
     <channel lang="es" xmltv_id="StudioUniversalArgentina.ar" site_id="ar#studio-universal">Studio Universal Argentina</channel>
     <channel lang="es" xmltv_id="TBSAmericaLatina.us" site_id="ar#tbs">TBS América Latina</channel>
     <channel lang="es" xmltv_id="TCMArgentina.ar" site_id="ar#tcm">TCM Argentina</channel>
-    <channel lang="es" xmltv_id="TecTV.ar" site_id="ar#tecnopolis">Tec TV</channel>
+    <channel lang="es" xmltv_id="TECTV.ar" site_id="ar#tecnopolis">Tec TV</channel>
     <channel lang="es" xmltv_id="TelediarioTV.ar" site_id="ar#telediario">Telediario TV</channel>
     <channel lang="es" xmltv_id="Telefe.ar" site_id="ar#telefe">Telefe</channel>
     <channel lang="es" xmltv_id="TelefeCordoba.ar" site_id="ar#teleocho">Telefe Córdoba</channel>
@@ -151,7 +151,7 @@
     <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>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatina.us" site_id="ar#universal-channel">Universal TV América Latina</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="ar#universal-channel">Universal TV América Latina</channel>
     <channel lang="es" xmltv_id="UruguayNaturalTV.uy" site_id="ar#uruguay-natural-uruguay">Uruguay Natural TV</channel>
     <channel lang="es" xmltv_id="Venus.ar" site_id="ar#venus">Venus</channel>
     <channel lang="es" xmltv_id="Viajar.es" site_id="ar#viajar">Viajar</channel>
diff --git a/sites/mi.tv/mi.tv_br.channels.xml b/sites/mi.tv/mi.tv_br.channels.xml
index d81990f8..1b4a3261 100644
--- a/sites/mi.tv/mi.tv_br.channels.xml
+++ b/sites/mi.tv/mi.tv_br.channels.xml
@@ -2,12 +2,12 @@
 <site site="mi.tv">
   <channels>
     <channel lang="pt" xmltv_id="AEBrasil.br" site_id="br#a-e">A&amp;E Brasil</channel>
-    <channel lang="pt" xmltv_id="AgroPlus.br" site_id="br#agromais-hd">Agro+</channel>
+    <channel lang="pt" xmltv_id="AgroMais.br" site_id="br#agromais-hd">Agro+</channel>
     <channel lang="pt" xmltv_id="AmazonSat.br" site_id="br#amazon-sat">Amazon Sat</channel>
     <channel lang="pt" xmltv_id="AMCBrasil.br" site_id="br#amc-brasil">AMC Brasil</channel>
     <channel lang="pt" xmltv_id="AnimalPlanetBrasil.br" site_id="br#animal-planet">Animal Planet Brasil</channel>
     <channel lang="pt" xmltv_id="Arte1.br" site_id="br#arte-1">Arte 1</channel>
-    <channel lang="pt" xmltv_id="AXNBrazil.us" site_id="br#axn">AXN Brazil</channel>
+    <channel lang="pt" xmltv_id="AXNBrazil.br" site_id="br#axn">AXN Brazil</channel>
     <channel lang="pt" xmltv_id="BabyTVBrazil.br" site_id="br#baby-tv">Baby TV Brasil</channel>
     <channel lang="pt" xmltv_id="BandAmazonas.br" site_id="br#band-amazonas">Band Amazonas</channel>
     <channel lang="pt" xmltv_id="BandBahia.br" site_id="br#band-bahia">Band Bahia</channel>
@@ -20,7 +20,7 @@
     <channel lang="pt" xmltv_id="BloombergTVBrazil.br" site_id="br#bloomberg">Bloomberg TV Brazil</channel>
     <channel lang="pt" xmltv_id="BoasNovas.br" site_id="br#rede-boas-novas">Boas Novas</channel>
     <channel lang="pt" xmltv_id="BoaVontadeTV.br" site_id="br#boa-vontade-tv">Boa Vontade TV</channel>
-    <channel lang="pt" xmltv_id="BoomerangBrasil.us" site_id="br#boomerang">Boomerang Brasil</channel>
+    <channel lang="pt" xmltv_id="BoomerangBrazil.br" site_id="br#boomerang">Boomerang Brasil</channel>
     <channel lang="pt" xmltv_id="CanalBrasil.br" site_id="br#canal-brasil">Canal Brasil</channel>
     <channel lang="pt" xmltv_id="CanaldoBoi.br" site_id="br#canal-do-boi">Canal do Boi</channel>
     <channel lang="pt" xmltv_id="CanalFutura.br" site_id="br#futura">Canal Futura</channel>
@@ -44,7 +44,7 @@
     <channel lang="pt" xmltv_id="DiscoveryHomeHealthBrasil.br" site_id="br#discovery-home-health">Discovery Home &amp; Health Brasil</channel>
     <channel lang="pt" xmltv_id="DiscoveryKidsBrasil.br" site_id="br#discovery-kids">Discovery Kids Brasil</channel>
     <channel lang="pt" xmltv_id="DiscoveryScienceBrasil.us" site_id="br#discovery-science">Discovery Science Brasil</channel>
-    <channel lang="pt" xmltv_id="DiscoveryTheater.us" site_id="br#discovery-theater-hd">Discovery Theater</channel>
+    <channel lang="pt" xmltv_id="DiscoveryTheaterHD.us" site_id="br#discovery-theater-hd">Discovery Theater</channel>
     <channel lang="pt" xmltv_id="DiscoveryTurboBrasil.br" site_id="br#discovery-turbo">Discovery Turbo Brasil</channel>
     <channel lang="pt" xmltv_id="DiscoveryWorldBrasil.br" site_id="br#discovery-world-hd">Discovery World Brasil</channel>
     <channel lang="pt" xmltv_id="DisneyChannelBrasil.br" site_id="br#disney">Disney Channel Brasil</channel>
@@ -82,7 +82,7 @@
     <channel lang="pt" xmltv_id="InterTVAltoLitoral.br" site_id="br#intertv-alto-literal-hd">Inter TV Alto Litoral</channel>
     <channel lang="pt" xmltv_id="InterTVCabugi.br" site_id="br#intertv-cabugi-hd">Inter TV Cabugi</channel>
     <channel lang="pt" xmltv_id="InterTVGrandeMinas.br" site_id="br#intertv-grande-minas-hd">Inter TV Grande Minas</channel>
-    <channel lang="pt" xmltv_id="InterTVSerramar.br" site_id="br#intertv-serra-mar-hd">Inter TV Serramar</channel>
+    <channel lang="pt" xmltv_id="InterTVSerraPlusMar.br" site_id="br#intertv-serra-mar-hd">Inter TV Serramar</channel>
     <channel lang="pt" xmltv_id="InvestigacaoDiscoveryBrasil.br" site_id="br#investigacao-discovery">Investigação Discovery Brasil</channel>
     <channel lang="pt" xmltv_id="ISatBrasil.br" site_id="br#i-sat">I-Sat Brasil</channel>
     <channel lang="pt" xmltv_id="JPNews.br" site_id="br#jovem-pan-news">Jovem Pan News</channel>
@@ -115,17 +115,17 @@
     <channel lang="pt" xmltv_id="RBSTVPortoAlegre.br" site_id="br#rbs-tv-porto-alegre-hd">RBS TV Porto Alegre</channel>
     <channel lang="pt" xmltv_id="RBSTVRS.br" site_id="br#globo-rbs-tv-poa">RBS TV RS</channel>
     <channel lang="pt" xmltv_id="RBSTVSantaMaria.br" site_id="br#rbs-tv-santa-maria-hd">RBS TV Santa Maria</channel>
-    <channel lang="pt" xmltv_id="RecordBelem.br" site_id="br#recordtv-belem">Record Belém</channel>
-    <channel lang="pt" xmltv_id="RecordCabralia.br" site_id="br#record-cuiaba-hd">Record Cabrália</channel>
-    <channel lang="pt" xmltv_id="RecordGoias.br" site_id="br#record-tv-goias-hd">Record Goiás</channel>
-    <channel lang="pt" xmltv_id="RecordItapoan.br" site_id="br#record-tv-itapoan-hd">Record Itapoan</channel>
-    <channel lang="pt" xmltv_id="RecordMinas.br" site_id="br#record-tv-minas-hd">Record Minas</channel>
-    <channel lang="pt" xmltv_id="RecordNacional.br" site_id="br#record" >Record Nacional</channel>
+    <channel lang="pt" xmltv_id="RecordTVBelem.br" site_id="br#recordtv-belem">Record Belém</channel>
+    <channel lang="pt" xmltv_id="RecordTVCabralia.br" site_id="br#record-cuiaba-hd">Record Cabrália</channel>
+    <channel lang="pt" xmltv_id="RecordTVGoias.br" site_id="br#record-tv-goias-hd">Record Goiás</channel>
+    <channel lang="pt" xmltv_id="RecordTVItapoan.br" site_id="br#record-tv-itapoan-hd">Record Itapoan</channel>
+    <channel lang="pt" xmltv_id="RecordTVMinas.br" site_id="br#record-tv-minas-hd">Record Minas</channel>
+    <channel lang="pt" xmltv_id="RecordTV.br" site_id="br#record" >Record Nacional</channel>
     <channel lang="pt" xmltv_id="RecordNews.br" site_id="br#record-news">Record News</channel>
-    <channel lang="pt" xmltv_id="RecordPaulista.br" site_id="br#recordtv-paulista-hd">Record Paulista</channel>
-    <channel lang="pt" xmltv_id="RecordRio.br" site_id="br#record-tv-rio-hd">Record Rio</channel>
-    <channel lang="pt" xmltv_id="RecordRioGrandedoSul.br" site_id="br#record-porto-alegre-hd">Record Rio Grande do Sul</channel>
-    <channel lang="pt" xmltv_id="RecordSaoPaulo.br" site_id="br#recordtv-s-o-paulo-hd">Record São Paulo</channel>
+    <channel lang="pt" xmltv_id="RecordTVPaulista.br" site_id="br#recordtv-paulista-hd">Record Paulista</channel>
+    <channel lang="pt" xmltv_id="RecordTVRio.br" site_id="br#record-tv-rio-hd">Record Rio</channel>
+    <channel lang="pt" xmltv_id="RecordTVRS.br" site_id="br#record-porto-alegre-hd">Record Rio Grande do Sul</channel>
+    <channel lang="pt" xmltv_id="RecordTVSaoPaulo.br" site_id="br#recordtv-s-o-paulo-hd">Record São Paulo</channel>
     <channel lang="pt" xmltv_id="Rede21.br" site_id="br#rede-21-hd">Rede 21</channel>
     <channel lang="pt" xmltv_id="RedeAmazonica.br" site_id="br#globo-amazonas">Rede Amazônica</channel>
     <channel lang="pt" xmltv_id="RedeAmazonicaManaus.br" site_id="br#rede-amazonica-manaus-hd">Rede Amazônica Manaus</channel>
@@ -247,7 +247,7 @@
     <channel lang="pt" xmltv_id="TVTropical.br" site_id="br#tv-tropical">TV Tropical</channel>
     <channel lang="pt" xmltv_id="TVUniaoFortaleza.br" site_id="br#tv-uni-o">TV União Fortaleza</channel>
     <channel lang="pt" xmltv_id="TVVerdesMares.br" site_id="br#tv-verdes-mares-1">TV Verdes Mares</channel>
-    <channel lang="pt" xmltv_id="UniversalTVBrasil.br" site_id="br#universal">Universal TV Brasil</channel>
+    <channel lang="pt" xmltv_id="UniversalTVBrazil.br" site_id="br#universal">Universal TV Brasil</channel>
     <channel lang="pt" xmltv_id="UnivespTV.br" site_id="br#univesp-tv">Univesp TV</channel>
     <channel lang="pt" xmltv_id="VH1Europe.uk" site_id="br#vh1">VH1 Europe</channel>
     <channel lang="pt" xmltv_id="WarnerChannelBrasil.br" site_id="br#warner-channel">Warner Channel Brasil</channel>
diff --git a/sites/mi.tv/mi.tv_cl.channels.xml b/sites/mi.tv/mi.tv_cl.channels.xml
index 818ea60f..5964c990 100644
--- a/sites/mi.tv/mi.tv_cl.channels.xml
+++ b/sites/mi.tv/mi.tv_cl.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="es" xmltv_id="ARTV.cl" site_id="cl#artv">ARTV</channel>
     <channel lang="es" xmltv_id="AzCinema.mx" site_id="cl#az-cinema">Az Cinema</channel>
     <channel lang="es" xmltv_id="AztecaUno.mx" site_id="cl#azteca-13">Azteca Uno</channel>
-    <channel lang="es" xmltv_id="BoomerangAtlanticoSur.us" site_id="cl#boomerang-cartoon">Boomerang Atlántico Sur</channel>
+    <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="cl#boomerang-cartoon">Boomerang Atlántico Sur</channel>
     <channel lang="es" xmltv_id="Canal13.cl" site_id="cl#canal-13">Canal 13</channel>
     <channel lang="es" xmltv_id="Canal24Horas.es" site_id="cl#canal-24-hs-espana">Canal 24 Horas</channel>
     <channel lang="es" xmltv_id="Canal7Jujuy.ar" site_id="cl#canal-7">Canal 7 Jujuy</channel>
@@ -66,7 +66,7 @@
     <channel lang="es" xmltv_id="StudioUniversalChile.cl" site_id="cl#studio-universal">Studio Universal Chile</channel>
     <channel lang="es" xmltv_id="TBSAtlanticoSur.us" site_id="cl#tbs-veryfunny">TBS Atlántico Sur</channel>
     <channel lang="es" xmltv_id="TCMAmericaLatina.us" site_id="cl#tcm">TCM América Latina</channel>
-    <channel lang="es" xmltv_id="Teletrak.cl" site_id="cl#teletrak">Teletrak</channel>
+    <channel lang="es" xmltv_id="TeletrakTV.cl" site_id="cl#teletrak">Teletrak</channel>
     <channel lang="es" xmltv_id="TNTChile.cl" site_id="cl#tnt">TNT Chile</channel>
     <channel lang="es" xmltv_id="TVN.cl" site_id="ar#tvn-chile">TVN</channel>
     <channel lang="es" xmltv_id="TVNuevoTiempo.us" site_id="cl#nuevo-tiempo">TV Nuevo Tiempo</channel>
diff --git a/sites/mi.tv/mi.tv_co.channels.xml b/sites/mi.tv/mi.tv_co.channels.xml
index ff6a4098..42178f8e 100644
--- a/sites/mi.tv/mi.tv_co.channels.xml
+++ b/sites/mi.tv/mi.tv_co.channels.xml
@@ -2,7 +2,6 @@
 <site site="mi.tv">
   <channels>
     <channel lang="es" xmltv_id="AlientoVision.us" site_id="co#aliento-vision">Aliento Vision</channel>
-    <channel lang="es" xmltv_id="AXNCentro.us" site_id="co#axn">AXN Centro</channel>
     <channel lang="es" xmltv_id="AXNLatinAmerica.us" site_id="co#axn">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="AzMundo.mx" site_id="co#az-mundo-hd">Az Mundo</channel>
     <channel lang="es" xmltv_id="Canal1.co" site_id="co#canal-uno">Canal 1</channel>
diff --git a/sites/mi.tv/mi.tv_hn.channels.xml b/sites/mi.tv/mi.tv_hn.channels.xml
index c1ff4746..0edd8129 100644
--- a/sites/mi.tv/mi.tv_hn.channels.xml
+++ b/sites/mi.tv/mi.tv_hn.channels.xml
@@ -21,7 +21,7 @@
     <channel lang="es" xmltv_id="Teleceiba.hn" site_id="hn#teleceiba">Teleceiba</channel>
     <channel lang="es" xmltv_id="Telesistema3y7.hn" site_id="hn#telesistema-hondureno">Telesistema 3 y 7</channel>
     <channel lang="es" xmltv_id="Televicentro.hn" site_id="hn#canal-5">Televicentro</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaWest.us" site_id="hn#universal-channel">Universal TV América Latina Oeste</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="hn#universal-channel">Universal TV América Latina Oeste</channel>
     <channel lang="es" xmltv_id="VTV.hn" site_id="hn#vica-vtv">VTV</channel>
   </channels>
 </site>
diff --git a/sites/mi.tv/mi.tv_mx.channels.xml b/sites/mi.tv/mi.tv_mx.channels.xml
index b75123cd..0af60921 100644
--- a/sites/mi.tv/mi.tv_mx.channels.xml
+++ b/sites/mi.tv/mi.tv_mx.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="es" xmltv_id="AMCMexico.mx" site_id="mx#amc">AMC México</channel>
     <channel lang="es" xmltv_id="Azteca7.mx" site_id="mx#azteca-7">Azteca 7</channel>
-    <channel lang="es" xmltv_id="BoomerangMexico.us" site_id="mx#boomerang-cartoon">Boomerang México</channel>
+    <channel lang="es" xmltv_id="BoomerangMexico.mx" site_id="mx#boomerang-cartoon">Boomerang México</channel>
     <channel lang="es" xmltv_id="Canal22MetropolitanayNacional.mx" site_id="mx#canal-22-conaculta">Canal 22 Metropolitana y Nacional</channel>
     <channel lang="es" xmltv_id="ElNu9ve.mx" site_id="mx#galavision">El Nu9ve</channel>
     <channel lang="es" xmltv_id="LasEstrellasMexico.mx" site_id="mx#canal-de-las-estrellas-xew">Las Estrellas</channel>
@@ -15,8 +15,8 @@
     <channel lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="mx#disney">Disney Channel México</channel>
     <channel lang="es" xmltv_id="ElFinancieroBloomberg.mx" site_id="mx#el-financiero-bloomberg">El Financiero Bloomberg</channel>
     <channel lang="es" xmltv_id="Foro.mx" site_id="mx#canal-4-foro-tv">Foro TV</channel>
-    <channel lang="es" xmltv_id="MilenioTV.mx" site_id="mx#milenio-tv">Milenio TV</channel>
-    <channel lang="es" xmltv_id="NuMusic.mx" site_id="mx#canal-nu">Nu Music</channel>
+    <channel lang="es" xmltv_id="MilenioTelevision.mx" site_id="mx#milenio-tv">Milenio TV</channel>
+    <channel lang="es" xmltv_id="NUMusic.mx" site_id="mx#canal-nu">Nu Music</channel>
     <channel lang="es" xmltv_id="OnceMexico.mx" site_id="mx#xeipn-canal-11">Once México</channel>
     <channel lang="es" xmltv_id="SpaceMexico.mx" site_id="mx#space">Space México</channel>
     <channel lang="es" xmltv_id="StarChannelMexico.mx" site_id="mx#fox">Star Channel México</channel>
@@ -24,9 +24,9 @@
     <channel lang="es" xmltv_id="StudioUniversalMexico.mx" site_id="mx#studio-universal">Studio Universal México</channel>
     <channel lang="es" xmltv_id="TlnovelasMexico.mx" site_id="mx#tlnovelas">Tlnovelas México</channel>
     <channel lang="es" xmltv_id="TNTMexico.mx" site_id="mx#tnt">TNT México</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatinaEast.us" site_id="sv#universal-channel">Universal TV América Latina Este</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="sv#universal-channel">Universal TV América Latina Este</channel>
     <channel lang="es" xmltv_id="UniversalTVMexico.mx" site_id="mx#universal-channel">Universal TV México</channel>
     <channel lang="es" xmltv_id="WarnerChannelMexico.mx" site_id="mx#warner">Warner Channel México</channel>
-    <channel lang="es" xmltv_id="WOBITV.ar" site_id="mx#wobi-tv">WOBI TV</channel>
+    <channel lang="es" xmltv_id="WOBI.ar" site_id="mx#wobi-tv">WOBI TV</channel>
   </channels>
 </site>
diff --git a/sites/mi.tv/mi.tv_pe.channels.xml b/sites/mi.tv/mi.tv_pe.channels.xml
index 9c67f23c..e7db59cd 100644
--- a/sites/mi.tv/mi.tv_pe.channels.xml
+++ b/sites/mi.tv/mi.tv_pe.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="es" xmltv_id="CitytvBogota.co" site_id="pe#citytv">City TV</channel>
     <channel lang="es" xmltv_id="DWDeutschPlus.de" site_id="pe#deutsche-welle-amerika">DW Deutsch+</channel>
     <channel lang="es" xmltv_id="GlobalTV.pe" site_id="pe#nex-tv">Global TV</channel>
-    <channel lang="es" xmltv_id="Latele.pe" site_id="pe#la-tele">Latele</channel>
+    <channel lang="es" xmltv_id="LaTele.pe" site_id="pe#la-tele">Latele</channel>
     <channel lang="es" xmltv_id="Latina.pe" site_id="pe#frecuencia-latina">Latina</channel>
     <channel lang="es" xmltv_id="MasChicEstadosUnidos.us" site_id="pe#mas-chic">Más Chic Estados Unidos</channel>
     <channel lang="es" xmltv_id="MiGenteTV.co" site_id="pe#mi-gente">Mi Gente TV</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index 16eeedfb..66aa20ab 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="en" xmltv_id="BeritaSatu.id" site_id="103">Berita Satu</channel>
     <channel lang="en" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
     <channel lang="en" xmltv_id="BloombergTVAsia.us" site_id="338">Bloomberg TV Asia</channel>
-    <channel lang="en" xmltv_id="BoomerangSouthEastAsia.us" site_id="39">Boomerang South East Asia</channel>
+    <channel lang="en" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang South East Asia</channel>
     <channel lang="en" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon Network Asia</channel>
     <channel lang="en" xmltv_id="CBeebiesAsia.uk" site_id="41">CBeebies Asia</channel>
     <channel lang="en" xmltv_id="CelestialClassicMovies.hk" site_id="22">Celestial Classic Movies</channel>
@@ -32,7 +32,7 @@
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation Asia</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="201">Discovery Channel Southeast Asia</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
-    <channel lang="en" xmltv_id="Ent.id" site_id="86">Ent</channel>
+    <channel lang="en" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="304">Fight Sports</channel>
     <channel lang="en" xmltv_id="FMN.id" site_id="150">FMN</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="335">Fox News Channel</channel>
@@ -94,7 +94,7 @@
     <channel lang="en" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
     <channel lang="en" xmltv_id="TVNMovies.hk" site_id="25">TVN Movies Indonesia</channel>
     <channel lang="en" xmltv_id="TVNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
-    <channel lang="en" xmltv_id="TVOne.id" site_id="97">TVOne</channel>
+    <channel lang="en" xmltv_id="tvOne.id" site_id="97">TVOne</channel>
     <channel lang="en" xmltv_id="TVRINasional.id" site_id="118">TVRI Nasional</channel>
     <channel lang="en" xmltv_id="VisionPrime.id" site_id="94">Vision Prime</channel>
     <channel lang="en" xmltv_id="WarnerTVSoutheastAsia.us" site_id="163">Warner TV Southeast Asia</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index c0dbe685..21aa6a49 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="id" xmltv_id="BeritaSatu.id" site_id="103">Berita Satu</channel>
     <channel lang="id" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
     <channel lang="id" xmltv_id="BloombergTVAsia.us" site_id="338">Bloomberg TV Asia</channel>
-    <channel lang="id" xmltv_id="BoomerangSouthEastAsia.us" site_id="39">Boomerang South East Asia</channel>
+    <channel lang="id" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang South East Asia</channel>
     <channel lang="id" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon Network Asia</channel>
     <channel lang="id" xmltv_id="CBeebiesAsia.uk" site_id="41">CBeebies Asia</channel>
     <channel lang="id" xmltv_id="CelestialClassicMovies.hk" site_id="22">Celestial Classic Movies</channel>
@@ -32,7 +32,7 @@
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation Asia</channel>
     <channel lang="id" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="201">Discovery Channel Southeast Asia</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
-    <channel lang="id" xmltv_id="Ent.id" site_id="86">Ent</channel>
+    <channel lang="id" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
     <channel lang="id" xmltv_id="FightSports.us" site_id="304">Fight Sports</channel>
     <channel lang="id" xmltv_id="FMN.id" site_id="150">FMN</channel>
     <channel lang="id" xmltv_id="FoxNewsChannel.us" site_id="335">Fox News Channel</channel>
@@ -94,7 +94,7 @@
     <channel lang="id" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
     <channel lang="id" xmltv_id="TVNMovies.hk" site_id="25">TVN Movies Indonesia</channel>
     <channel lang="id" xmltv_id="TVNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
-    <channel lang="id" xmltv_id="TVOne.id" site_id="97">TVOne</channel>
+    <channel lang="id" xmltv_id="tvOne.id" site_id="97">TVOne</channel>
     <channel lang="id" xmltv_id="TVRINasional.id" site_id="118">TVRI Nasional</channel>
     <channel lang="id" xmltv_id="VisionPrime.id" site_id="94">Vision Prime</channel>
     <channel lang="id" xmltv_id="WarnerTVSoutheastAsia.us" site_id="163">Warner TV Southeast Asia</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es.channels.xml b/sites/movistarplus.es/movistarplus.es_es.channels.xml
index 84164f98..e3f3a957 100644
--- a/sites/movistarplus.es/movistarplus.es_es.channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="es" xmltv_id="FutbolReplay.es" site_id="FUTREP">Canal Fútbol Replay</channel>
     <channel lang="es" xmltv_id="CanalHollywoodSpain.es" site_id="HOLLYW">Canal Hollywood España</channel>
     <channel lang="es" xmltv_id="CanalPandaSpain.pt" site_id="PANDA">Canal Panda España</channel>
-    <channel lang="es" xmltv_id="CanalSur.us" site_id="CSURHD">Canal Sur</channel>
+    <channel lang="es" xmltv_id="CanalSUR.us" site_id="CSURHD">Canal Sur</channel>
     <channel lang="es" xmltv_id="CanalSurAndalucia.es" site_id="ANDATV">Canal Sur Andalucía</channel>
     <channel lang="es" xmltv_id="CazayPesca.es" site_id="CAZPES">Caza y Pesca</channel>
     <channel lang="es" xmltv_id="CGTN.cn" site_id="CCTV-E">CGTN Español</channel>
@@ -74,7 +74,7 @@
     <channel lang="es" xmltv_id="Eurosport2.fr" site_id="ESP2">Eurosport 2</channel>
     <channel lang="es" xmltv_id="EWTNEspanaLatinAmerica.us" site_id="EWTN">EWTN España - Latinoamérica</channel>
     <channel lang="es" xmltv_id="FactoriadeFiccion.es" site_id="FDFIC">Factoria de Ficción</channel>
-    <channel lang="es" xmltv_id="FoxSpain.us" site_id="FOXGE">Fox España</channel>
+    <channel lang="es" xmltv_id="FoxSpain.es" site_id="FOXGE">Fox España</channel>
     <channel lang="es" xmltv_id="FoxNewsChannel.us" site_id="FOXNWS">Fox News Channel</channel>
     <channel lang="es" xmltv_id="France24Espanol.fr" site_id="FRANCE">France 24 Español</channel>
     <channel lang="es" xmltv_id="GaliciaTVEuropa.es" site_id="TVGAL">Galicia TV Europa</channel>
@@ -86,7 +86,7 @@
     <channel lang="es" xmltv_id="La1.es" site_id="TVE">La 1</channel>
     <channel lang="es" xmltv_id="La2.es" site_id="LA2">La 2</channel>
     <channel lang="es" xmltv_id="La7.es" site_id="CYLTV">La 7</channel>
-    <channel lang="es" xmltv_id="LaOcho.es" site_id="MEDITE">La Ocho TV</channel>
+    <channel lang="es" xmltv_id="LaOchoTV.es" site_id="MEDITE">La Ocho TV</channel>
     <channel lang="es" xmltv_id="LaOtra.es" site_id="OTRA">LaOtra</channel>
     <channel lang="es" xmltv_id="LaResistencia.es" site_id="RESIST">La Resistencia</channel>
     <channel lang="es" xmltv_id="LasEstrellasEuropa.mx" site_id="GALAV">Las Estrellas Europa</channel>
@@ -95,7 +95,7 @@
     <channel lang="es" xmltv_id="Mezzo.fr" site_id="MEZZO">Mezzo</channel>
     <channel lang="es" xmltv_id="MezzoLiveHD.fr" site_id="MEZOHD">Mezzo Live HD</channel>
     <channel lang="es" xmltv_id="MovistarAccion.es" site_id="CPACCI">Movistar Acción</channel>
-    <channel lang="es" xmltv_id="MovistarCineSpanish.es" site_id="DCESP">Movistar Cine Español</channel>
+    <channel lang="es" xmltv_id="MovistarCineEspanol.es" site_id="DCESP">Movistar Cine Español</channel>
     <channel lang="es" xmltv_id="MovistarClasicos.es" site_id="MCLAS">Movistar Clásicos</channel>
     <channel lang="es" xmltv_id="MovistarComedia.es" site_id="CPCOME">Movistar Comedia</channel>
     <channel lang="es" xmltv_id="MovistarDeportes.es" site_id="CPDEP">Movistar Deportes</channel>
@@ -162,14 +162,14 @@
     <channel lang="es" xmltv_id="StingrayClassica.ca" site_id="CLASSI">Stingray Classica</channel>
     <channel lang="es" xmltv_id="SundanceTVSpain.us" site_id="SUNDAN">Sundance TV España</channel>
     <channel lang="es" xmltv_id="SyfySpain.us" site_id="SCI-FI">Syfy España</channel>
-    <channel lang="es" xmltv_id="TCMSpain.us" site_id="TCM">TCM España</channel>
+    <channel lang="es" xmltv_id="TCMSpain.es" site_id="TCM">TCM España</channel>
     <channel lang="es" xmltv_id="Telecinco.es" site_id="T5">Telecinco</channel>
     <channel lang="es" xmltv_id="Teledeporte.es" site_id="TDEP">Teledeporte</channel>
     <channel lang="es" xmltv_id="TelefeInternacional.ar" site_id="TELEFE">Telefe Internacional</channel>
     <channel lang="es" xmltv_id="Telemadrid.es" site_id="TELMAD">Telemadrid</channel>
     <channel lang="es" xmltv_id="Telesur.ve" site_id="TLESUR">Telesur</channel>
-    <channel lang="es" xmltv_id="Ten.es" site_id="TEN">Ten</channel>
-    <channel lang="es" xmltv_id="TNTSpain.us" site_id="TNT">TNT España</channel>
+    <channel lang="es" xmltv_id="TEN.es" site_id="TEN">Ten</channel>
+    <channel lang="es" xmltv_id="TNTSpain.es" site_id="TNT">TNT España</channel>
     <channel lang="es" xmltv_id="Toros.es" site_id="CFERIA">Toros TV</channel>
     <channel lang="es" xmltv_id="TPA7.es" site_id="TPA">TPA 7</channel>
     <channel lang="es" xmltv_id="TreceTV.es" site_id="13TV">Trece TV</channel>
diff --git a/sites/mtel.ba/mtel.ba_ba.channels.xml b/sites/mtel.ba/mtel.ba_ba.channels.xml
index 61ae21fe..6f4390dc 100644
--- a/sites/mtel.ba/mtel.ba_ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba_ba.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="bs" xmltv_id="BalkanTrip.rs" site_id="027#460">Balkan Trip</channel>
     <channel lang="bs" xmltv_id="BangU.us" site_id="912#375">Bang U</channel>
     <channel lang="bs" xmltv_id="BHT1.ba" site_id="063#283">BHT 1</channel>
-    <channel lang="bs" xmltv_id="BN.ba" site_id="002#289">BN</channel>
+    <channel lang="bs" xmltv_id="BNTV.ba" site_id="002#289">BN</channel>
     <channel lang="bs" xmltv_id="BNMusic.ba" site_id="623#192">BN Music</channel>
     <channel lang="bs" xmltv_id="BoomerangCentralEasternEurope.us" site_id="204#432">Boomerang Central &amp; Eastern Europe</channel>
     <channel lang="bs" xmltv_id="CafeClub.rs" site_id="608#231">Cafe &amp; Club</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index 5b98e6ca..8372d643 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -32,7 +32,7 @@
     <channel lang="sr" xmltv_id="BalkanTV.rs" site_id="533#310">Balkan TV</channel>
     <channel lang="sr" xmltv_id="BBCEarthRomania.ro" site_id="360#342">BBC Earth Romania</channel>
     <channel lang="sr" xmltv_id="BloombergTVEurope.us" site_id="669#193">Bloomberg TV Europe</channel>
-    <channel lang="sr" xmltv_id="BN.ba" site_id="136#12">BN</channel>
+    <channel lang="sr" xmltv_id="BNTV.ba" site_id="136#12">BN</channel>
     <channel lang="sr" xmltv_id="BNMusic.ba" site_id="463#192">BN Music</channel>
     <channel lang="sr" xmltv_id="BoomerangCentralEasternEurope.us" site_id="408#87">Boomerang Central &amp; Eastern Europe</channel>
     <channel lang="sr" xmltv_id="BravoMusic.rs" site_id="452#206">Bravo Music</channel>
@@ -317,7 +317,7 @@
     <channel lang="sr" xmltv_id="TVMars.rs" site_id="586#464">TV Marš</channel>
     <channel lang="sr" xmltv_id="TVMix.rs" site_id="566#685">TV Mix</channel>
     <channel lang="sr" xmltv_id="TVMost.rs" site_id="139#312">TV Most</channel>
-    <channel lang="sr" xmltv_id="TVNova.rs" site_id="604#441">TV Nova</channel>
+    <channel lang="sr" xmltv_id="NovaTV.rs" site_id="604#441">TV Nova</channel>
     <channel lang="sr" xmltv_id="TVNoviBecej.rs" site_id="530#500">TV Novi Bečej</channel>
     <channel lang="sr" xmltv_id="TVNoviPazar.rs" site_id="573#444">TV Novi Pazar</channel>
     <channel lang="sr" xmltv_id="TVPalmaPlus.rs" site_id="559#435">TV Palma Plus</channel>
diff --git a/sites/novacyprus.com/novacyprus.com_cy.channels.xml b/sites/novacyprus.com/novacyprus.com_cy.channels.xml
index 854f3dcb..12dbbe07 100644
--- a/sites/novacyprus.com/novacyprus.com_cy.channels.xml
+++ b/sites/novacyprus.com/novacyprus.com_cy.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="el" xmltv_id="FoxGreece.gr" site_id="609">Fox Greece</channel>
     <channel lang="el" xmltv_id="FoxLifeGreece.gr" site_id="570">Fox Life Greece</channel>
     <channel lang="el" xmltv_id="InsightTV.nl" site_id="81">Insight HD</channel>
-    <channel lang="el" xmltv_id="MadGreekz.gr" site_id="582">Mad Greekz</channel>
+    <channel lang="el" xmltv_id="MADGreekz.gr" site_id="582">Mad Greekz</channel>
     <channel lang="el" xmltv_id="MadTV.gr" site_id="227">Mad TV</channel>
     <channel lang="el" xmltv_id="MTVLive.uk" site_id="673">MTV Live</channel>
     <channel lang="el" xmltv_id="MyZenTV.fr" site_id="221">MyZen TV</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
index da938ec6..ef0b0f32 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="en" xmltv_id="beINSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
     <channel lang="en" xmltv_id="beINSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
     <channel lang="en" xmltv_id="BloombergTVAsia.us" site_id="321">Bloomberg TV Asia</channel>
-    <channel lang="en" xmltv_id="BoomerangSouthEastAsia.us" site_id="445">Boomerang South East Asia</channel>
+    <channel lang="en" xmltv_id="BoomerangSoutheastAsia.us" site_id="445">Boomerang South East Asia</channel>
     <channel lang="en" xmltv_id="CartoonNetworkAsia.sg" site_id="443">Cartoon Network Asia</channel>
     <channel lang="en" xmltv_id="CBeebiesAsia.uk" site_id="447">CBeebies Asia</channel>
     <channel lang="en" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index d743bb1d..396d9aac 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="zh" xmltv_id="beINSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
     <channel lang="zh" xmltv_id="beINSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
     <channel lang="zh" xmltv_id="BloombergTVAsia.us" site_id="321">Bloomberg TV Asia</channel>
-    <channel lang="zh" xmltv_id="BoomerangSouthEastAsia.us" site_id="445">Boomerang South East Asia</channel>
+    <channel lang="zh" xmltv_id="BoomerangSoutheastAsia.us" site_id="445">Boomerang South East Asia</channel>
     <channel lang="zh" xmltv_id="CartoonNetworkAsia.sg" site_id="443">Cartoon Network Asia</channel>
     <channel lang="zh" xmltv_id="CBeebiesAsia.uk" site_id="447">CBeebies Asia</channel>
     <channel lang="zh" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
index 9b2f431a..bfb23386 100644
--- a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
@@ -5,14 +5,14 @@
     <channel lang="en" xmltv_id="10Peach.au" site_id="au#1937/10-peach">10 Peach</channel>
     <channel lang="en" xmltv_id="10Shake.au" site_id="au#3346/10-shake">10 Shake</channel>
     <channel lang="en" xmltv_id="10Sydney.au" site_id="au#2795/10-hd">Ten</channel>
-    <channel lang="en" xmltv_id="7Central.au" site_id="au#2890/7-hd">Seven</channel>
+    <channel lang="en" xmltv_id="SevenNetwork.au" site_id="au#2890/7-hd">Seven</channel>
     <channel lang="en" xmltv_id="7flix.au" site_id="au#2773/7flix">7 flix</channel>
     <channel lang="en" xmltv_id="7mate.au" site_id="au#1732/7mate">7 mate</channel>
     <channel lang="en" xmltv_id="7two.au" site_id="au#1679/7two">7 Two</channel>
     <channel lang="en" xmltv_id="9Go.au" site_id="au#1796/go">9 Go!</channel>
     <channel lang="en" xmltv_id="9Life.au" site_id="au#2730/9life">9 Life</channel>
-    <channel lang="en" xmltv_id="9RushPerth.au" site_id="au#3326/9rush">9 Rush</channel>
-    <channel lang="en" xmltv_id="ABCKidsNSW.au" site_id="au#2043/abc-kids-abc-tv-plus">ABC Kids / ABC TV Plus</channel>
+    <channel lang="en" xmltv_id="9Rush.au" site_id="au#3326/9rush">9 Rush</channel>
+    <channel lang="en" xmltv_id="ABCKids.au" site_id="au#2043/abc-kids-abc-tv-plus">ABC Kids / ABC TV Plus</channel>
     <channel lang="en" xmltv_id="ABCMe.au" site_id="au#2096/abc-me">ABC ME</channel>
     <channel lang="en" xmltv_id="ABCNews.au" site_id="au#2149/abc-news">ABC News</channel>
     <channel lang="en" xmltv_id="ABCTV.au" site_id="au#2984/abc-tv-hd">ABC TV</channel>
@@ -22,7 +22,7 @@
     <channel lang="en" xmltv_id="Fox8.au" site_id="au#3182/fox8-hd">Fox 8</channel>
     <channel lang="en" xmltv_id="FoxArena.au" site_id="au#3154/fox-arena">Fox Arena</channel>
     <channel lang="en" xmltv_id="FoxClassicsAustralia.au" site_id="au#3185/fox-classics">Fox Classics</channel>
-    <channel lang="en" xmltv_id="FoxComedy.au" site_id="au#3192/fox-comedy">Fox Comedy</channel>
+    <channel lang="en" xmltv_id="FoxComedyAustralia.au" site_id="au#3192/fox-comedy">Fox Comedy</channel>
     <channel lang="en" xmltv_id="FoxCrimeAustralia.au" site_id="au#3234/fox-crime">Fox Crime</channel>
     <channel lang="en" xmltv_id="FoxDocos.au" site_id="au#3257/fox-docos-hd">Fox Docos</channel>
     <channel lang="en" xmltv_id="FoxFunny.au" site_id="au#3319/fox-funny-hd">Fox Funny</channel>
@@ -44,8 +44,8 @@
     <channel lang="en" xmltv_id="NITV.au" site_id="au#2545/nitv">NITV</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="au#3432/pbs-kids">PBS Kids</channel>
     <channel lang="en" xmltv_id="Racingcom.au" site_id="au#2865/racingcom">Racing.com</channel>
-    <channel lang="en" xmltv_id="SBSFoodNSW.au" site_id="au#2682/sbs-food">SBS Food</channel>
-    <channel lang="en" xmltv_id="SBSNSW.au" site_id="au#2333/sbs-one">SBS One</channel>
+    <channel lang="en" xmltv_id="SBSFood.au" site_id="au#2682/sbs-food">SBS Food</channel>
+    <channel lang="en" xmltv_id="SBSTV.au" site_id="au#2333/sbs-one">SBS One</channel>
     <channel lang="en" xmltv_id="SBSWorldMovies.au" site_id="au#2386/sbs-world-movies">SBS World Movies</channel>
     <channel lang="en" xmltv_id="SpreeTV.au" site_id="au#2627/spreetv">SpreeTV</channel>
   </channels>
diff --git a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
index 8ad2d2fb..6e0ff05e 100644
--- a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
@@ -85,10 +85,10 @@
     <channel lang="en" xmltv_id="SkyOneUK.uk" site_id="uk#69036865/sky-one">Sky One UK</channel>
     <channel lang="en" xmltv_id="SmithsonianChannelUK.uk" site_id="uk#7051414680/smithsonian">Smithsonian Channel UK</channel>
     <channel lang="en" xmltv_id="SonyChannelUK.us" site_id="uk#69041546/sony-channel">Sony Channel UK</channel>
-    <channel lang="en" xmltv_id="SonyMoviesAction.us" site_id="uk#69041512/sony-movies-action">Sony Movies Action</channel>
-    <channel lang="en" xmltv_id="SonyMoviesClassic.us" site_id="uk#69041290/sony-movies-classic">Sony Movies Classic</channel>
-    <channel lang="en" xmltv_id="SonyMoviesUK.us" site_id="uk#69046254/sony-movies-uk">Sony Movies UK</channel>
-    <channel lang="en" xmltv_id="SonyMoviesUKPlus1.us" site_id="uk#69046255/sony-movies1-uk">Sony Movies UK +1</channel>
+    <channel lang="en" xmltv_id="SonyMoviesAction.uk" site_id="uk#69041512/sony-movies-action">Sony Movies Action</channel>
+    <channel lang="en" xmltv_id="SonyMoviesClassic.uk" site_id="uk#69041290/sony-movies-classic">Sony Movies Classic</channel>
+    <channel lang="en" xmltv_id="SonyMoviesUK.uk" site_id="uk#69046254/sony-movies-uk">Sony Movies UK</channel>
+    <channel lang="en" xmltv_id="SonyMoviesUKPlus1.uk" site_id="uk#69046255/sony-movies1-uk">Sony Movies UK +1</channel>
     <channel lang="en" xmltv_id="SpotlightTV.uk" site_id="uk#7497801352/spotlight-tv">Spotlight TV</channel>
     <channel lang="en" xmltv_id="TalkingPicturesTV.uk" site_id="uk#1632302783/talking-pictures-tv">Talking Pictures TV</channel>
     <channel lang="en" xmltv_id="TBNUK.uk" site_id="uk#7551679520/tbn-uk">TBN UK</channel>
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
index b18f497d..ba90cdd0 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="es" xmltv_id="CanalHollywoodSpain.es" site_id="61">Canal Hollywood España</channel>
     <channel lang="es" xmltv_id="CanalPandaSpain.pt" site_id="698">Canal Panda España</channel>
     <channel lang="es" xmltv_id="CanalParlamento.es" site_id="604">Canal Parlamento</channel>
-    <channel lang="es" xmltv_id="CanalSur.us" site_id="30">Canal Sur</channel>
+    <channel lang="es" xmltv_id="CanalSUR.us" site_id="30">Canal Sur</channel>
     <channel lang="es" xmltv_id="CanalSurAndalucia.es" site_id="31">Canal Sur Andalucía</channel>
     <channel lang="es" xmltv_id="CaracolTVInternacional.co" site_id="566">Caracol TV Internacional</channel>
     <channel lang="es" xmltv_id="CazayPesca.es" site_id="386">Caza y Pesca</channel>
@@ -54,8 +54,8 @@
     <channel lang="es" xmltv_id="EWTNEspanaLatinAmerica.us" site_id="190">EWTN España - Latinoamérica</channel>
     <channel lang="es" xmltv_id="ExtremeSportsChannel.nl" site_id="550">Extreme Sports Channel</channel>
     <channel lang="es" xmltv_id="FactoriadeFiccion.es" site_id="506">Factoria de Ficción</channel>
-    <channel lang="es" xmltv_id="FoxSpain.us" site_id="202">Fox España</channel>
-    <channel lang="es" xmltv_id="FoxLifeSpain.us" site_id="660">Fox Life España</channel>
+    <channel lang="es" xmltv_id="FoxSpain.es" site_id="202">Fox España</channel>
+    <channel lang="es" xmltv_id="FoxLifeSpain.es" site_id="660">Fox Life España</channel>
     <channel lang="es" xmltv_id="France24Espanol.fr" site_id="608">France 24 Español</channel>
     <channel lang="es" xmltv_id="GaliciaTVEuropa.es" site_id="37">Galicia TV Europa</channel>
     <channel lang="es" xmltv_id="GarageTV.ar" site_id="786">Garage TV</channel>
@@ -67,9 +67,9 @@
     <channel lang="es" xmltv_id="Mezzo.fr" site_id="338">Mezzo</channel>
     <channel lang="es" xmltv_id="MezzoLiveHD.fr" site_id="748">Mezzo Live HD</channel>
     <channel lang="es" xmltv_id="MovistarAccion.es" site_id="847">Movistar Acción</channel>
-    <channel lang="es" xmltv_id="MovistarCineSpanish.es" site_id="385">Movistar Cine Español</channel>
+    <channel lang="es" xmltv_id="MovistarCineEspanol.es" site_id="385">Movistar Cine Español</channel>
     <channel lang="es" xmltv_id="MovistarComedia.es" site_id="848">Movistar Comedia</channel>
-    <channel lang="es" xmltv_id="MovistarDeportes.pe" site_id="377">Movistar Deportes</channel>
+    <channel lang="es" xmltv_id="MovistarDeportesPeru.pe" site_id="377">Movistar Deportes</channel>
     <channel lang="es" xmltv_id="MovistarEstrenos.es" site_id="845">Movistar Estrenos</channel>
     <channel lang="es" xmltv_id="MovistarSeries.es" site_id="843">Movistar Series</channel>
     <channel lang="es" xmltv_id="MTV90s.uk" site_id="160">MTV 90s</channel>
@@ -93,11 +93,11 @@
     <channel lang="es" xmltv_id="SundanceTVSpain.us" site_id="699">Sundance TV España</channel>
     <channel lang="es" xmltv_id="SyfySpain.us" site_id="520">Syfy España</channel>
     <channel lang="es" xmltv_id="Taroteame.es" site_id="826">Tarotéame</channel>
-    <channel lang="es" xmltv_id="TCMSpain.us" site_id="59">TCM España</channel>
+    <channel lang="es" xmltv_id="TCMSpain.es" site_id="59">TCM España</channel>
     <channel lang="es" xmltv_id="Telecinco.es" site_id="1">Telecinco</channel>
     <channel lang="es" xmltv_id="Teledeporte.es" site_id="9">Teledeporte</channel>
     <channel lang="es" xmltv_id="Telesur.ve" site_id="614">Telesur</channel>
-    <channel lang="es" xmltv_id="TNTSpain.us" site_id="577">TNT España</channel>
+    <channel lang="es" xmltv_id="TNTSpain.es" site_id="577">TNT España</channel>
     <channel lang="es" xmltv_id="TV3.es" site_id="43">TV3</channel>
     <channel lang="es" xmltv_id="TV3CAT.es" site_id="47">TV3CAT</channel>
     <channel lang="es" xmltv_id="TV5MondeEurope.fr" site_id="209">TV5Monde Europe</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index bac356a7..0e5dc1c1 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -14,8 +14,8 @@
     <channel lang="ro" xmltv_id="AntenaStars.ro" site_id="antena-stars">Antena Stars</channel>
     <channel lang="ro" xmltv_id="AutoMotorundSport.de" site_id="auto-motor-und-sport-channel">Auto Motor und Sport</channel>
     <channel lang="ro" xmltv_id="AXNBlack.us" site_id="axn-black">AXN Black</channel>
-    <channel lang="ro" xmltv_id="AXNRomania.ro" site_id="axn">AXN Romania</channel>
-    <channel lang="ro" xmltv_id="AXNSpinRomania.ro" site_id="axn-spin">AXN Spin Romania</channel>
+    <channel lang="ro" xmltv_id="AXNEurope.gr" site_id="axn">AXN Romania</channel>
+    <channel lang="ro" xmltv_id="AXNSpin.gr" site_id="axn-spin">AXN Spin Romania</channel>
     <channel lang="ro" xmltv_id="AXNWhite.us" site_id="axn-white">AXN White</channel>
     <channel lang="ro" xmltv_id="B1.ro" site_id="b1-tv">B1</channel>
     <channel lang="ro" xmltv_id="BabyTVEurope.uk" site_id="babytv">Baby TV Europe</channel>
@@ -131,7 +131,7 @@
     <channel lang="ro" xmltv_id="MTV90s.uk" site_id="mtv-90s">MTV 90s</channel>
     <channel lang="ro" xmltv_id="MTVHitsEurope.uk" site_id="mtv-hits">MTV Hits Europe</channel>
     <channel lang="ro" xmltv_id="MTVLive.uk" site_id="mtv-live-hd">MTV Live HD</channel>
-    <channel lang="ro" xmltv_id="Museum.fr" site_id="museum-hd">Museum</channel>
+    <channel lang="ro" xmltv_id="MuseumTV.fr" site_id="museum-hd">Museum</channel>
     <channel lang="ro" xmltv_id="MusicChannelRomania.ro" site_id="music-channel">Music Channel Romania</channel>
     <channel lang="ro" xmltv_id="MuzsikaTV.hu" site_id="muzsika-tv">Muzsika TV</channel>
     <channel lang="ro" xmltv_id="MyZenTV.fr" site_id="myzen-hd">MyZen TV</channel>
diff --git a/sites/programme-tv.net/programme-tv.net_fr.channels.xml b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
index b84e1a44..ed4060f1 100644
--- a/sites/programme-tv.net/programme-tv.net_fr.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
@@ -44,7 +44,7 @@
     <channel lang="fr" xmltv_id="CanalPlusKids.fr" site_id="canalplus-kids-149">Canal + Kids</channel>
     <channel lang="fr" xmltv_id="CanalPlusFormula1.fr" site_id="canalplus-formula-1-10503">Canal + Formula 1</channel>
     <channel lang="fr" xmltv_id="CanalPlusFrance.fr" site_id="canalplus-2">Canal + France</channel>
-    <channel lang="fr" xmltv_id="CanalPlusMotoGp.fr" site_id="canalplus-moto-gp-10505">Canal + Moto GP</channel>
+    <channel lang="fr" xmltv_id="CanalPlusMotoGP.fr" site_id="canalplus-moto-gp-10505">Canal + Moto GP</channel>
     <channel lang="fr" xmltv_id="CanalPlusPremierLeague.fr" site_id="canalplus-premier-league-10506">Canal + Premier League</channel>
     <channel lang="fr" xmltv_id="CanalPlusSeriesFrance.fr" site_id="canalplus-series-227">Canal + Séries France</channel>
     <channel lang="fr" xmltv_id="CanalPlusSportFrance.fr" site_id="canalplus-sport-37">Canal + Sport France</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 1edc3aad..92338bc8 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="pl" xmltv_id="4FunTV.pl" site_id="4fun-tv-269">4 Fun TV</channel>
     <channel lang="pl" xmltv_id="ActiveFamily.pl" site_id="active-family-300">Active Family</channel>
     <channel lang="pl" xmltv_id="AdultChannel.uk" site_id="adult-channel-265">Adult Channel</channel>
-    <channel lang="pl" xmltv_id="Adventure.pl" site_id="adventure-303">Adventure</channel>
+    <channel lang="pl" xmltv_id="AdventureTV.pl" site_id="adventure-303">Adventure</channel>
     <channel lang="pl" xmltv_id="AleKinoPlus.pl" site_id="ale-kino-319">Ale Kino +</channel>
     <channel lang="pl" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera-hd-609">Aljazeera English</channel>
     <channel lang="pl" xmltv_id="AMCPoland.us" site_id="mgm-333">AMC Polska</channel>
@@ -19,10 +19,10 @@
     <channel lang="pl" xmltv_id="ARTEDeutsch.de" site_id="arte-253">ARTE Deutsch</channel>
     <channel lang="pl" xmltv_id="ATV.at" site_id="atv-251">ATV</channel>
     <channel lang="pl" xmltv_id="Automotolachaine.fr" site_id="ab-moteurs-242">Automoto la chaîne</channel>
-    <channel lang="pl" xmltv_id="AXNBlackPoland.us" site_id="axn-black-271">AXN Black Polska</channel>
-    <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="AXNBlack.us" site_id="axn-black-271">AXN Black</channel>
+    <channel lang="pl" xmltv_id="AXNEurope.gr" site_id="axn-249">AXN</channel>
+    <channel lang="pl" xmltv_id="AXNSpin.gr" site_id="axn-spin-294">AXN Spin</channel>
+    <channel lang="pl" xmltv_id="AXNWhite.us" site_id="axn-white-272">AXN White</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>
@@ -121,8 +121,8 @@
     <channel lang="pl" xmltv_id="FokusTV.pl" site_id="fokus-tv-46">Fokus TV</channel>
     <channel lang="pl" xmltv_id="Folx.de" site_id="folx-tv-206">Folx</channel>
     <channel lang="pl" xmltv_id="FoodNetworkPoland.pl" site_id="polsat-food-157">Food Network Polska</channel>
-    <channel lang="pl" xmltv_id="FoxComedyPoland.us" site_id="fox-comedy-75">Fox Comedy Polska</channel>
-    <channel lang="pl" xmltv_id="FoxPoland.us" site_id="fox-127">Fox Polska</channel>
+    <channel lang="pl" xmltv_id="FoxComedyPoland.pl" site_id="fox-comedy-75">Fox Comedy Polska</channel>
+    <channel lang="pl" xmltv_id="FoxPoland.pl" site_id="fox-127">Fox Polska</channel>
     <channel lang="pl" xmltv_id="France2.fr" site_id="france-2-pl-329">France 2</channel>
     <channel lang="pl" xmltv_id="France24English.fr" site_id="france-24-en-70">France 24 English</channel>
     <channel lang="pl" xmltv_id="France24French.fr" site_id="france-24-491">France 24 Français</channel>
@@ -222,10 +222,10 @@
     <channel lang="pl" xmltv_id="PolsatSportNews.pl" site_id="polsat-sport-news-431">Polsat Sport News</channel>
     <channel lang="pl" xmltv_id="PolsatSportPremium1.pl" site_id="polsat-sport-premium-1-643">Polsat Sport Premium 1</channel>
     <channel lang="pl" xmltv_id="PolsatSportPremium2.pl" site_id="polsat-sport-premium-2-644">Polsat Sport Premium 2</channel>
-    <channel lang="pl" xmltv_id="PolsatSportPremium3.pl" site_id="polsat-sport-premium-3-645">Polsat Sport Premium 3</channel>
-    <channel lang="pl" xmltv_id="PolsatSportPremium4.pl" site_id="polsat-sport-premium-4-646">Polsat Sport Premium 4</channel>
-    <channel lang="pl" xmltv_id="PolsatSportPremium5.pl" site_id="polsat-sport-premium-5-642">Polsat Sport Premium 5</channel>
-    <channel lang="pl" xmltv_id="PolsatSportPremium6.pl" site_id="polsat-sport-premium-6-641">Polsat Sport Premium 6</channel>
+    <channel lang="pl" xmltv_id="PolsatSportPremium3PPV.pl" site_id="polsat-sport-premium-3-645">Polsat Sport Premium 3</channel>
+    <channel lang="pl" xmltv_id="PolsatSportPremium4PPV.pl" site_id="polsat-sport-premium-4-646">Polsat Sport Premium 4</channel>
+    <channel lang="pl" xmltv_id="PolsatSportPremium5PPV.pl" site_id="polsat-sport-premium-5-642">Polsat Sport Premium 5</channel>
+    <channel lang="pl" xmltv_id="PolsatSportPremium6PPV.pl" site_id="polsat-sport-premium-6-641">Polsat Sport Premium 6</channel>
     <channel lang="pl" xmltv_id="PowerTV.pl" site_id="power-tv-176">Power TV</channel>
     <channel lang="pl" xmltv_id="PrivateTV.nl" site_id="private-tv-351">Private TV</channel>
     <channel lang="pl" xmltv_id="ProSiebenGermany.de" site_id="pro-7-395">ProSieben Deutschland</channel>
@@ -236,7 +236,7 @@
     <channel lang="pl" xmltv_id="RBBBerlin.de" site_id="rbb-466">RBB Berlin</channel>
     <channel lang="pl" xmltv_id="RealityKingsTV.us" site_id="reality-kings-tv-223">Reality Kings TV</channel>
     <channel lang="pl" xmltv_id="RecordTVEuropa.pt" site_id="record-tv-64">Record TV Europa</channel>
-    <channel lang="pl" xmltv_id="RedCarpet.pl" site_id="etv-473">Red Carpet</channel>
+    <channel lang="pl" xmltv_id="RedCarpetTV.pl" site_id="etv-473">Red Carpet</channel>
     <channel lang="pl" xmltv_id="RedlightHD.nl" site_id="redlight-hd-498">Redlight HD</channel>
     <channel lang="pl" xmltv_id="Relax.cz" site_id="tv-relax-496">Relax</channel>
     <channel lang="pl" xmltv_id="RFMTV.fr" site_id="rfm-tv-95">RFM TV</channel>
@@ -269,7 +269,7 @@
     <channel lang="pl" xmltv_id="Sport1.de" site_id="sport-1-362">Sport 1</channel>
     <channel lang="pl" xmltv_id="SportKlubPoland.pl" site_id="sportklub-29">Sport Klub Polska</channel>
     <channel lang="pl" xmltv_id="SRF1.ch" site_id="srf-1-406">SRF 1</channel>
-    <channel lang="pl" xmltv_id="SRFZwei.ch" site_id="srf-zwei-407">SRF Zwei</channel>
+    <channel lang="pl" xmltv_id="SRFzwei.ch" site_id="srf-zwei-407">SRF Zwei</channel>
     <channel lang="pl" xmltv_id="StarsTV.pl" site_id="stars-tv-149">Stars TV</channel>
     <channel lang="pl" xmltv_id="StingrayClassica.ca" site_id="classica-259">Stingray Classica</channel>
     <channel lang="pl" xmltv_id="StingrayCMusic.ca" site_id="c-music-tv-260">Stingray CMusic</channel>
@@ -332,7 +332,7 @@
     <channel lang="pl" xmltv_id="VividRed.us" site_id="vivid-red-hd-627">Vivid Red</channel>
     <channel lang="pl" xmltv_id="VividTouch.us" site_id="vivid-touch-636">Vivid Touch</channel>
     <channel lang="pl" xmltv_id="VoxGermany.de" site_id="vox-418">Vox Deutschland</channel>
-    <channel lang="pl" xmltv_id="VoxMusicTV.pl" site_id="vox-music-tv-193">Vox Music TV</channel>
+    <channel lang="pl" xmltv_id="VOXMusicTV.pl" site_id="vox-music-tv-193">Vox Music TV</channel>
     <channel lang="pl" xmltv_id="WaterPlanet.pl" site_id="water-planet-415">Water Planet</channel>
     <channel lang="pl" xmltv_id="WDR1Live.de" site_id="einslive-427">WDR 1 Live</channel>
     <channel lang="pl" xmltv_id="Welt.de" site_id="n-24-384">Welt</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
index c31b58f7..ccb476a2 100644
--- a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="en" xmltv_id="BBCTwo.uk" site_id="UID50295">BBC Two</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="UID50069">BBC World</channel>
     <channel lang="en" xmltv_id="CNNInternationalEurope.us" site_id="UID50032">CNN</channel>
-    <channel lang="en" xmltv_id="ESportsOne.de" site_id="UID0689">eSportsONE</channel>
+    <channel lang="en" xmltv_id="eSports1.de" site_id="UID0689">eSportsONE</channel>
     <channel lang="en" xmltv_id="EuronewsEnglish.fr" site_id="UID50085">Euronews E</channel>
     <channel lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="UID0100">Extreme</channel>
     <channel lang="en" xmltv_id="FashionTVEurope.fr" site_id="UID50031">FashionTV</channel>
diff --git a/sites/rev.bs/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
index bffbc4fd..8e95c190 100644
--- a/sites/rev.bs/rev.bs_bs.channels.xml
+++ b/sites/rev.bs/rev.bs_bs.channels.xml
@@ -22,7 +22,7 @@
     <channel lang="en" xmltv_id="BloombergTV.us" site_id="417">Bloomberg TV US</channel>
     <channel lang="en" xmltv_id="Boomerang.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>
+    <channel lang="en" xmltv_id="BravoEast.us" site_id="483">Bravo</channel>
     <channel lang="en" xmltv_id="CalaClassics.bs" site_id="358">Cala Classics</channel>
     <channel lang="en" xmltv_id="CalaWeather.bs" site_id="412">Cala Weather</channel>
     <channel lang="en" xmltv_id="CaribVision.bb" site_id="271">CaribVision</channel>
@@ -49,7 +49,7 @@
     <channel lang="en" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="268">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="en" xmltv_id="DiscoveryKidsColombia.co" site_id="304">Discovery Kids Colombia</channel>
     <channel lang="en" xmltv_id="DiscoveryScienceLatinAmerica.us" site_id="262">Discovery Science Latinoamérica</channel>
-    <channel lang="en" xmltv_id="DiscoveryTheater.us" site_id="275">Discovery Theater</channel>
+    <channel lang="en" xmltv_id="DiscoveryTheaterHD.us" site_id="275">Discovery Theater</channel>
     <channel lang="en" xmltv_id="DiscoveryTurboAmericaLatina.us" site_id="263">Discovery Turbo América Latina</channel>
     <channel lang="en" xmltv_id="DisneyChannelEast.us" site_id="300">Disney Channel East</channel>
     <channel lang="en" xmltv_id="DisneyJuniorEast.us" site_id="320">Disney Junior East</channel>
@@ -170,7 +170,7 @@
     <channel lang="en" xmltv_id="TruTVEast.us" site_id="414">Tru TV East</channel>
     <channel lang="en" xmltv_id="TSN1.ca" site_id="715">TSN 1</channel>
     <channel lang="en" xmltv_id="TV5MondeEtatsUnis.us" site_id="677">TV5Monde États-Unis</channel>
-    <channel lang="en" xmltv_id="TVO.ca" site_id="306">TVO</channel>
+    <channel lang="en" xmltv_id="TVOntario.ca" site_id="306">TVO</channel>
     <channel lang="en" xmltv_id="TVOne.us" site_id="366">TV One</channel>
     <channel lang="en" xmltv_id="UnivisionEast.us" site_id="679">Univisión Este</channel>
     <channel lang="en" xmltv_id="VH1USEast.us" site_id="372">VH1 East</channel>
diff --git a/sites/seezntv.com/seezntv.com_kr.channels.xml b/sites/seezntv.com/seezntv.com_kr.channels.xml
index 9bcb628e..ae4d19d0 100644
--- a/sites/seezntv.com/seezntv.com_kr.channels.xml
+++ b/sites/seezntv.com/seezntv.com_kr.channels.xml
@@ -58,7 +58,7 @@
     <channel lang="ko" xmltv_id="NationalGeographicWildAsia.hk" site_id="232">NAT GEO WILD</channel>
     <channel lang="ko" xmltv_id="NSHomeShopping.kr" site_id="441">NS홈쇼핑</channel>
     <channel lang="ko" xmltv_id="NSShopPlus.kr" site_id="461">NS SHOP＋</channel>
-    <channel lang="ko" xmltv_id="OBS.kr" site_id="407">OBS</channel>
+    <channel lang="ko" xmltv_id="OBSGyeonginTV.kr" site_id="407">OBS</channel>
     <channel lang="ko" xmltv_id="OCN.kr" site_id="801">OCN</channel>
     <channel lang="ko" xmltv_id="OGN.kr" site_id="288">OGN</channel>
     <channel lang="ko" xmltv_id="OLife.kr" site_id="503">OLIFE</channel>
diff --git a/sites/siba.com.co/siba.com.co_co.channels.xml b/sites/siba.com.co/siba.com.co_co.channels.xml
index b36a8eee..8e89c1fe 100644
--- a/sites/siba.com.co/siba.com.co_co.channels.xml
+++ b/sites/siba.com.co/siba.com.co_co.channels.xml
@@ -21,7 +21,7 @@
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="839">Cinemax Latinoamérica</channel>
     <channel lang="es" xmltv_id="CitytvBogota.co" site_id="412">City TV</channel>
     <channel lang="es" xmltv_id="ClaroCinema.mx" site_id="985">Claro Cinema</channel>
-    <channel lang="es" xmltv_id="ClaromusicaTV.co" site_id="566">Claro música TV</channel>
+    <channel lang="es" xmltv_id="ClaroMusicaTV.co" site_id="566">Claro música TV</channel>
     <channel lang="es" xmltv_id="ClaroSportsChile.cl" site_id="602">Claro Sports Chile</channel>
     <channel lang="es" xmltv_id="CNNenEspanol.us" site_id="413">CNN en Español</channel>
     <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSouth.us" site_id="702">Comedy Central Latinoamérica Sur</channel>
@@ -93,7 +93,7 @@
     <channel lang="es" xmltv_id="TruTVAmericaLatina.us" site_id="592">Tru TV América Latina</channel>
     <channel lang="es" xmltv_id="TVAgro.co" site_id="593">TV Agro</channel>
     <channel lang="es" xmltv_id="TVFamilia.ve" site_id="1055">TV Familia</channel>
-    <channel lang="es" xmltv_id="UniversalTVAmericaLatina.us" site_id="598">Universal TV América Latina</channel>
+    <channel lang="es" xmltv_id="UniversalTVHDLatinAmericaSouth.us" site_id="598">Universal TV América Latina</channel>
     <channel lang="es" xmltv_id="Venus.ar" site_id="601">Venus</channel>
     <channel lang="es" xmltv_id="VePlusPanregional.ve" site_id="652">Ve Plus Panregional</channel>
     <channel lang="es" xmltv_id="WarnerChannelPanregional.us" site_id="608">Warner Channel Panregional</channel>
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index 8aa9fef6..3b453092 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -137,7 +137,7 @@
     <channel lang="en" xmltv_id="IslamChannel.uk" site_id="3214">Islam Channel</channel>
     <channel lang="en" xmltv_id="IslamChannelUrdu.uk" site_id="5211">Islam Channel Urdu</channel>
     <channel lang="en" xmltv_id="IslamTV.uk" site_id="4403">Islam TV</channel>
-    <channel lang="en" xmltv_id="JMLDirect.uk" site_id="5761">JML Direct</channel>
+    <channel lang="en" xmltv_id="JMLDirectTV.uk" site_id="5761">JML Direct</channel>
     <channel lang="en" xmltv_id="JewelleryMaker.uk" site_id="3354">Jewellery Maker</channel>
     <channel lang="en" xmltv_id="KICCTV.uk" site_id="3776">KICC TV</channel>
     <channel lang="en" xmltv_id="KanshiTV.uk" site_id="3753">Kanshi TV</channel>
@@ -184,7 +184,7 @@
     <channel lang="en" xmltv_id="QuestRedUKPlus1.uk" site_id="4547">Quest Red UK +1</channel>
     <channel lang="en" xmltv_id="QuestUK.uk" site_id="1128">Quest</channel>
     <channel lang="en" xmltv_id="RTE2.ie" site_id="1270">RTÉ2</channel>
-    <channel lang="en" xmltv_id="RTEJr.ie" site_id="1256">RTÉjr</channel>
+    <channel lang="en" xmltv_id="RTEjr.ie" site_id="1256">RTÉjr</channel>
     <channel lang="en" xmltv_id="RTENews.ie" site_id="2804">RTÉ News</channel>
     <channel lang="en" xmltv_id="RTEOne.ie" site_id="2816">RTÉ One</channel>
     <channel lang="en" xmltv_id="RTUK.ru" site_id="3213">RT UK</channel>
diff --git a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
index 5f661b5a..58ddb920 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
+++ b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
@@ -22,7 +22,7 @@
     <channel lang="en" xmltv_id="beINSports4.qa" site_id="215">beIN Sports 4 HD</channel>
     <channel lang="en" xmltv_id="beINSports5.qa" site_id="216">beIN Sports 5 HD</channel>
     <channel lang="en" xmltv_id="BloombergTVAsia.us" site_id="708">Bloomberg Television HD</channel>
-    <channel lang="en" xmltv_id="BoomerangAsia.us" site_id="317">Boomerang HD</channel>
+    <channel lang="en" xmltv_id="BoomerangAsia.sg" site_id="317">Boomerang HD</channel>
     <channel lang="en" xmltv_id="CartoonNetworkAsia.sg" site_id="316">Cartoon Network</channel>
     <channel lang="en" xmltv_id="CBeebiesAsia.uk" site_id="303">Cbeebies HD</channel>
     <channel lang="en" xmltv_id="CCTV4Asia.cn" site_id="801">CCTV-4</channel>
@@ -66,7 +66,7 @@
     <channel lang="en" xmltv_id="HubSports2.sg" site_id="202">Hub Sports 2 HD</channel>
     <channel lang="en" xmltv_id="HubSports3.sg" site_id="204">Hub Sports 3 HD</channel>
     <channel lang="en" xmltv_id="HubVVDrama.sg" site_id="855">Hub VVDrama HD</channel>
-    <channel lang="en" xmltv_id="Kalaignar.in" site_id="141">Kalaignar TV</channel>
+    <channel lang="en" xmltv_id="KalaignarTV.in" site_id="141">Kalaignar TV</channel>
     <channel lang="en" xmltv_id="Karisma.id" site_id="116">Karisma</channel>
     <channel lang="en" xmltv_id="KBSWorld.kr" site_id="815">KBS World HD</channel>
     <channel lang="en" xmltv_id="KTVHD.in" site_id="159">KTV HD</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 2842dcf3..04d80465 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -15,7 +15,7 @@
     <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>
-    <channel lang="id" xmltv_id="BoomerangAsia.us" site_id="BOOM">Boomerang HD</channel>
+    <channel lang="id" xmltv_id="BoomerangAsia.sg" site_id="BOOM">Boomerang HD</channel>
     <channel lang="id" xmltv_id="CartoonNetworkAsia.sg" site_id="CAR">Cartoon Network HD</channel>
     <channel lang="id" xmltv_id="CCTV4Asia.cn" site_id="CCTV">CCTV 4</channel>
     <channel lang="id" xmltv_id="CelestialMoviesIndonesia.id" site_id="CELE">Celestial Movies</channel>
@@ -75,7 +75,7 @@
     <channel lang="id" xmltv_id="TransTV.id" site_id="TRTV">TransTV HD</channel>
     <channel lang="id" xmltv_id="TV5MondeAsie.fr" site_id="TMO">TV 5 Monde</channel>
     <channel lang="id" xmltv_id="TVNAsia.hk" site_id="TVN">tvN HD</channel>
-    <channel lang="id" xmltv_id="TVOne.id" site_id="TV1">tvOne</channel>
+    <channel lang="id" xmltv_id="tvOne.id" site_id="TV1">tvOne</channel>
     <channel lang="id" xmltv_id="TVRINasional.id" site_id="TVRI">TVRI</channel>
     <channel lang="id" xmltv_id="WarnerTVSoutheastAsia.us" site_id="WAR">Warner TV HD</channel>
     <channel lang="id" xmltv_id="ZeeBioskop.id" site_id="ZBIO">Zee Bioskop</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 f6096d5f..ac576176 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -7,7 +7,7 @@
     <channel lang="ar" xmltv_id="AlMasriyah.eg" site_id="154">Al Masriyah</channel>
     <channel lang="ar" xmltv_id="DubaiTV.ae" site_id="138">Dubai TV</channel>
     <channel lang="ar" xmltv_id="Watania1.tn" site_id="1673">Watania 1</channel>
-    <channel lang="bs" xmltv_id="BNTVSatelitski.ba" site_id="48">BN TV Satelitski</channel>
+    <channel lang="bs" xmltv_id="BNTV.ba" site_id="48">BN TV Satelitski</channel>
     <channel lang="bs" xmltv_id="HayatFolk.ba" site_id="196">Hayat Folk</channel>
     <channel lang="bs" xmltv_id="HayatPlus.ba" site_id="197">Hayat Plus</channel>
     <channel lang="bs" xmltv_id="OBN.ba" site_id="1481">OBN</channel>
@@ -26,7 +26,7 @@
     <channel lang="de" xmltv_id="AuftankenTV.ch" site_id="1216">Auftanken TV</channel>
     <channel lang="de" xmltv_id="AutoMotorogSportTV.no" site_id="1783">Auto Motor og Sport TV</channel>
     <channel lang="de" xmltv_id="AutoMotorundSport.de" site_id="1616">Auto Motor und Sport</channel>
-    <channel lang="de" xmltv_id="AXNGermany.us" site_id="32">Sony AXN</channel>
+    <channel lang="de" xmltv_id="AXNGermany.de" site_id="32">Sony AXN</channel>
     <channel lang="de" xmltv_id="Bergblick.de" site_id="1409">Bergblick</channel>
     <channel lang="de" xmltv_id="BibelTV.de" site_id="44">Bibel TV</channel>
     <channel lang="de" xmltv_id="Bild.de" site_id="1865">Bild</channel>
@@ -77,7 +77,7 @@
     <channel lang="de" xmltv_id="Junior.de" site_id="224">Junior</channel>
     <channel lang="de" xmltv_id="kabeleinsclassics.de" site_id="1389">Kabel Eins Classics</channel>
     <channel lang="de" xmltv_id="kabeleinsDoku.de" site_id="920">Kabel Eins Doku Deutschland</channel>
-    <channel lang="de" xmltv_id="KabelEinsSchweiz.ch" site_id="226">Kabel Eins Schweiz</channel>
+    <channel lang="de" xmltv_id="kabeleinsSchweiz.ch" site_id="226">Kabel Eins Schweiz</channel>
     <channel lang="de" xmltv_id="Kanal9.se" site_id="227">Kanal 9</channel>
     <channel lang="de" xmltv_id="KIKA.de" site_id="228">KIKA</channel>
     <channel lang="de" xmltv_id="KinoweltTV.de" site_id="1399">Kinowelt TV</channel>
@@ -150,7 +150,7 @@
     <channel lang="de" xmltv_id="SRF1.ch" site_id="399">SRF 1</channel>
     <channel lang="de" xmltv_id="SRFernsehen.de" site_id="1502">SR Fernsehen</channel>
     <channel lang="de" xmltv_id="SRFInfo.ch" site_id="400">SRF Info</channel>
-    <channel lang="de" xmltv_id="SRFZwei.ch" site_id="401">SRF Zwei</channel>
+    <channel lang="de" xmltv_id="SRFzwei.ch" site_id="401">SRF Zwei</channel>
     <channel lang="de" xmltv_id="StarTV.ch" site_id="405">Star TV</channel>
     <channel lang="de" xmltv_id="StingrayClassica.ca" site_id="102">Stingray Classica</channel>
     <channel lang="de" xmltv_id="Sudostschweiz.ch" site_id="621">Südostschweiz</channel>
diff --git a/sites/tv.cctv.com/tv.cctv.com_cn.channels.xml b/sites/tv.cctv.com/tv.cctv.com_cn.channels.xml
index fbdee7c5..7f03d8a7 100644
--- a/sites/tv.cctv.com/tv.cctv.com_cn.channels.xml
+++ b/sites/tv.cctv.com/tv.cctv.com_cn.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="zh" xmltv_id="BRTVKakuChildrensChannel.cn" site_id="btvchild">BTV卡酷少儿</channel>
     <channel lang="zh" xmltv_id="BRTVLifeChannel.cn" site_id="btv7">BTV生活</channel>
     <channel lang="zh" xmltv_id="BRTVNewsChannel.cn" site_id="btv9">BTV新闻</channel>
-    <channel lang="zh" xmltv_id="BeijingTVScienceandEducationChannelChannel.cn" site_id="btv3">BTV科教</channel>
+    <channel lang="zh" xmltv_id="BRTVScienceEducationChannel.cn" site_id="btv3">BTV科教</channel>
     <channel lang="zh" xmltv_id="BRTVWinterOlympicsDocumentaryChannel.cn" site_id="btvjishi">BTV纪实</channel>
     <channel lang="zh" xmltv_id="CCTV1.cn" site_id="cctv1">CCTV 1</channel>
     <channel lang="zh" xmltv_id="CCTV10.cn" site_id="cctv10">CCTV 10</channel>
diff --git a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
index 8180b6b2..59f844ae 100644
--- a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
+++ b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
@@ -16,7 +16,7 @@
     <channel lang="hy" xmltv_id="KentronTV.am" site_id="2788">Kentron TV</channel>
     <channel lang="hy" xmltv_id="NorHayastanTV.am" site_id="2862">Nor Hayastan TV</channel>
     <channel lang="hy" xmltv_id="ShantMusicTV.am" site_id="2499">Shant Music</channel>
-    <channel lang="hy" xmltv_id="ShantSerial.am" site_id="2708">Shant Serial</channel>
+    <channel lang="hy" xmltv_id="ShantSerialHD.am" site_id="2708">Shant Serial</channel>
     <channel lang="hy" xmltv_id="TBNArmenia.us" site_id="2969">TBN Armenia</channel>
     <channel lang="hy" xmltv_id="YerkirMediaTV.am" site_id="2787">Yerkir Media TV</channel>
     <channel lang="ru" xmltv_id="ShantTV.am" site_id="1641">Shant TV</channel>
diff --git a/sites/tv.nu/tv.nu_se.channels.xml b/sites/tv.nu/tv.nu_se.channels.xml
index 677350e1..810b4279 100644
--- a/sites/tv.nu/tv.nu_se.channels.xml
+++ b/sites/tv.nu/tv.nu_se.channels.xml
@@ -40,7 +40,7 @@
     <channel lang="sv" xmltv_id="DRRamasjang.dk" site_id="dr-ramasjang">DR Ramasjang</channel>
     <channel lang="sv" xmltv_id="DWEnglish.de" site_id="dw">DW</channel>
     <channel lang="sv" xmltv_id="EEurope.us" site_id="e">E!</channel>
-    <channel lang="sv" xmltv_id="ESportsOne.de" site_id="esportsone">eSportsone</channel>
+    <channel lang="sv" xmltv_id="eSports1.de" site_id="esportsone">eSportsone</channel>
     <channel lang="sv" xmltv_id="EuronewsEnglish.fr" site_id="euro-news">Euro News</channel>
     <channel lang="sv" xmltv_id="Eurosport1Sverige.se" site_id="eurosport-1">Eurosport 1</channel>
     <channel lang="sv" xmltv_id="Eurosport2Sverige.se" site_id="eurosport-2">Eurosport 2</channel>
@@ -132,7 +132,7 @@
     <channel lang="sv" xmltv_id="VFilmHits.se" site_id="v-film-hits">V Film Hits</channel>
     <channel lang="sv" xmltv_id="VFilmPremiere.se" site_id="v-film-premiere">V Film Premiere</channel>
     <channel lang="sv" xmltv_id="VH1Europe.uk" site_id="vh1">VH1</channel>
-    <channel lang="sv" xmltv_id="ViasatExploreRussia.ru" site_id="viasat-explore">Viasat Explore</channel>
+    <channel lang="sv" xmltv_id="ViasatExplore.se" site_id="viasat-explore">Viasat Explore</channel>
     <channel lang="sv" xmltv_id="ViasatHistoryHD.se" site_id="viasat-history">Viasat History</channel>
     <channel lang="sv" xmltv_id="ViasatNature.se" site_id="viasat-nature">Viasat Nature</channel>
     <channel lang="sv" xmltv_id="ViasatSport.se" site_id="viasat-sport-hd">Viasat Sport HD</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 0a0888ab..31586bd1 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tv.yandex.ru">
   <channels>
-    <channel lang="ru" xmltv_id="1HDMusicTV.ru" site_id="213#1hd-99">1HD Music TV</channel>
+    <channel lang="ru" xmltv_id="1HDMusicTelevision.ru" site_id="213#1hd-99">1HD Music TV</channel>
     <channel lang="ru" xmltv_id="24Krim.ru" site_id="977#krym-24-1376">24 Krim</channel>
     <channel lang="ru" xmltv_id="365dneiTV.ru" site_id="213#365-dney-tv-470">365 dnei TV</channel>
     <channel lang="ru" xmltv_id="5Kanal.ru" site_id="213#pyatyy-kanal-12">5 Kanal</channel>
-    <channel lang="ru" xmltv_id="7TV.ru" site_id="213#7-tv-1241">7 TV</channel>
+    <channel lang="ru" xmltv_id="7tv.ru" site_id="213#7-tv-1241">7 TV</channel>
     <channel lang="ru" xmltv_id="9Volna.ru" site_id="1104#acb-tv-179">9 Volna</channel>
     <channel lang="ru" xmltv_id="A1.ru" site_id="213#a1-237">A1</channel>
     <channel lang="ru" xmltv_id="A2.ru" site_id="213#a2-89">A2</channel>
@@ -79,7 +79,7 @@
     <channel lang="ru" xmltv_id="IndijskoeKino.ru" site_id="213#indiyskoe-kino-700">Indijskoe Kino</channel>
     <channel lang="ru" xmltv_id="InsightTVUHD.nl" site_id="213#insight-ultra-hd-1172">Insight UHD</channel>
     <channel lang="ru" xmltv_id="Istoriya.ru" site_id="213#istoriya-794">Istoriya</channel>
-    <channel lang="ru" xmltv_id="IzvestiaTV.ru" site_id="213#izvestiya-96">Izvestia TV</channel>
+    <channel lang="ru" xmltv_id="Izvestia.ru" site_id="213#izvestiya-96">Izvestia TV</channel>
     <channel lang="ru" xmltv_id="JimJamRussia.uk" site_id="213#jimjam-569">JimJam Rossiya</channel>
     <channel lang="ru" xmltv_id="KaleidoskopTV.ru" site_id="213#kaleydoskop-tv-232">Kaleidoskop TV</channel>
     <channel lang="ru" xmltv_id="DisneyChannelRussia.ru" site_id="213#kanal-disney-4">Kanal Disney</channel>
@@ -109,7 +109,7 @@
     <channel lang="ru" xmltv_id="LDPRTV.ru" site_id="213#ldpr-tv-1107">LDPR TV</channel>
     <channel lang="ru" xmltv_id="LenTV24.ru" site_id="2#47-kanal-223">Len TV 24</channel>
     <channel lang="ru" xmltv_id="LuxeTV.lu" site_id="213#luxetv-542">Luxe TV</channel>
-    <channel lang="ru" xmltv_id="Luxury.ru" site_id="213#luxury-785">Luxury</channel>
+    <channel lang="ru" xmltv_id="LuxuryHD.ru" site_id="213#luxury-785">Luxury</channel>
     <channel lang="ru" xmltv_id="Lyubimoe.ru" site_id="213#lyubimoetv-119">Lyubimoe</channel>
     <channel lang="ru" xmltv_id="MalyshTV.ru" site_id="213#malysh-1214">Malysh TV</channel>
     <channel lang="ru" xmltv_id="Mama.ru" site_id="213#mama-622">Mama</channel>
@@ -135,7 +135,7 @@
     <channel lang="ru" xmltv_id="MTVLive.uk" site_id="213#mtv-live-international-hd-513">MTV Live HD</channel>
     <channel lang="ru" xmltv_id="MTVRussia.ru" site_id="213#mtv-russia-783">MTV Russia</channel>
     <channel lang="ru" xmltv_id="Mult.ru" site_id="213#mult-1080">Mult</channel>
-    <channel lang="ru" xmltv_id="Museum.fr" site_id="213#museum-hd-1178">Museum</channel>
+    <channel lang="ru" xmltv_id="MuseumTV.fr" site_id="213#museum-hd-1178">Museum</channel>
     <channel lang="ru" xmltv_id="MusicBoxRussia.ru" site_id="213#russian-musicbox-177">Music Box Russia</channel>
     <channel lang="ru" xmltv_id="MuzhskoeKino.ru" site_id="213#mujskoe-kino-1145">Muzhskoe Kino</channel>
     <channel lang="ru" xmltv_id="Muzhskoy.ru" site_id="213#mujskoy-412">Muzhskoy</channel>
@@ -199,7 +199,7 @@
     <channel lang="ru" xmltv_id="RusskiyDetektiv.ru" site_id="213#russkiy-detektiv-1137">Russkiy Detektiv</channel>
     <channel lang="ru" xmltv_id="RusskiyIllusion.ru" site_id="213#russkiy-illyuzion-402">Russkiy Illusion</channel>
     <channel lang="ru" xmltv_id="RusskiyRoman.ru" site_id="213#russkiy-roman-520">Russkiy Roman</channel>
-    <channel lang="ru" xmltv_id="RuTV.ru" site_id="213#rutv-77">Ru TV</channel>
+    <channel lang="ru" xmltv_id="RUTV.ru" site_id="213#rutv-77">Ru TV</channel>
     <channel lang="ru" xmltv_id="Rybolov.ru" site_id="213#ohotnik-i-rybolov-430">Rybolov</channel>
     <channel lang="ru" xmltv_id="Ryzhiy.ru" site_id="213#ryjiy-1141">Ryzhiy</channel>
     <channel lang="ru" xmltv_id="RZDTV.ru" site_id="213#rjd-575">RZD TV</channel>
@@ -209,7 +209,7 @@
     <channel lang="ru" xmltv_id="ShotTV.ru" site_id="213#shot-tv-537">Shot TV</channel>
     <channel lang="ru" xmltv_id="SonyChannelRussia.us" site_id="213#sony-channel-493">Sony Channel Russia</channel>
     <channel lang="ru" xmltv_id="SonySciFiRussia.us" site_id="213#sony-sci-fi-576">Sony Sci-Fi Russia</channel>
-    <channel lang="ru" xmltv_id="SonyTurbo.us" site_id="213#sony-turbo-744">Sony Turbo</channel>
+    <channel lang="ru" xmltv_id="SonyTurbo.ru" site_id="213#sony-turbo-744">Sony Turbo</channel>
     <channel lang="ru" xmltv_id="SovershennoSekretnoTV.ru" site_id="213#sovershenno-sekretno-57">Sovershenno Sekretno TV</channel>
     <channel lang="ru" xmltv_id="Soyuz.ru" site_id="213#soyuz-108">Soyuz</channel>
     <channel lang="ru" xmltv_id="StingrayCMusic.ca" site_id="213#c-music-tv-496">Stingray CMusic</channel>
@@ -259,7 +259,7 @@
     <channel lang="ru" xmltv_id="Uspeh.ru" site_id="213#uspeh-63">Uspeh</channel>
     <channel lang="ru" xmltv_id="Vetta24.ru" site_id="213#vetta-24-165">Vetta 24</channel>
     <channel lang="ru" xmltv_id="VH1Europe.uk" site_id="213#vh1-european-567">VH1 Europe</channel>
-    <channel lang="ru" xmltv_id="ViasatExploreRussia.ru" site_id="213#viasat-explore-579">Viasat Explore Russia</channel>
+    <channel lang="ru" xmltv_id="ViasatExplore.se" site_id="213#viasat-explore-579">Viasat Explore Russia</channel>
     <channel lang="ru" xmltv_id="ViasatHistory.se" site_id="213#viasat-history-478">Viasat History</channel>
     <channel lang="ru" xmltv_id="ViasatNature.se" site_id="213#viasat-nature-cee-684">Viasat Nature East</channel>
     <channel lang="ru" xmltv_id="ViasatSport.se" site_id="213#viasat-sport-548">Viasat Sport East</channel>
@@ -274,7 +274,7 @@
     <channel lang="ru" xmltv_id="YamalRegion.ru" site_id="58#yamal-region-529">Yamal Region</channel>
     <channel lang="ru" xmltv_id="Yurgan.ru" site_id="213#yurgan-138">Yurgan</channel>
     <channel lang="ru" xmltv_id="ZagorodnayaZhizn.ru" site_id="213#zagorodnaya-jizn-390">Zagorodnaya Zhizn</channel>
-    <channel lang="ru" xmltv_id="Zagorodny.ru" site_id="213#zagorodnyy-666">Zagorodny</channel>
+    <channel lang="ru" xmltv_id="Zagorodnyy.ru" site_id="213#zagorodnyy-666">Zagorodny</channel>
     <channel lang="ru" xmltv_id="ZdorovoeTV.ru" site_id="213#zdorovoe-tv-609">Zdorovoe TV</channel>
     <channel lang="ru" xmltv_id="ZeeTVRussia.ru" site_id="213#zee-tv-627">Zee TV Russia</channel>
     <channel lang="ru" xmltv_id="ZharaTV.ru" site_id="213#jara-440">Zhara TV</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index 7661d5a7..5f8323a9 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -65,8 +65,8 @@
     <channel lang="sl" xmltv_id="DunaWorld.hu" site_id="1000786">Duna World</channel>
     <channel lang="sl" xmltv_id="Dusk.nl" site_id="1000373">Dusk</channel>
     <channel lang="sl" xmltv_id="EEurope.us" site_id="1000161">E! Europe</channel>
-    <channel lang="sl" xmltv_id="Elta2.ba" site_id="1000179">Elta 2</channel>
-    <channel lang="sl" xmltv_id="EltaTV.ba" site_id="1000240">Elta TV</channel>
+    <channel lang="sl" xmltv_id="ELTA2.ba" site_id="1000179">Elta 2</channel>
+    <channel lang="sl" xmltv_id="ELTAHD.ba" site_id="1000240">Elta TV</channel>
     <channel lang="sl" xmltv_id="EpicDrama.se" site_id="1000501">Epic Drama</channel>
     <channel lang="sl" xmltv_id="ePosavjeTV.si" site_id="1000651">ePosavje TV</channel>
     <channel lang="sl" xmltv_id="EroxHD.us" site_id="1000559">Erox HD</channel>
diff --git a/sites/tvgid.ua/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
index 59978b9f..efa93020 100644
--- a/sites/tvgid.ua/tvgid.ua_ua.channels.xml
+++ b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="uk" xmltv_id="DTXPoland.us" site_id="dtx">DTX Polska</channel>
     <channel lang="uk" xmltv_id="EnterFilm.ua" site_id="enter_film">Enter Film</channel>
     <channel lang="uk" xmltv_id="EspresoTV.ua" site_id="espresso_tv">Espreso TV</channel>
-    <channel lang="uk" xmltv_id="EuMusic.ua" site_id="eu_music">Eu Music</channel>
+    <channel lang="uk" xmltv_id="EUMusic.ua" site_id="eu_music">Eu Music</channel>
     <channel lang="uk" xmltv_id="Eurosport1Russia.ru" site_id="eurosport_1_rossiya">Eurosport 1 Rossiya</channel>
     <channel lang="uk" xmltv_id="Eurosport2Russia.ru" site_id="eurosport_2_rossiya">Eurosport 2 Rossiya</channel>
     <channel lang="uk" xmltv_id="Evrokino.ru" site_id="evrokino">Evrokino</channel>
@@ -57,7 +57,7 @@
     <channel lang="uk" xmltv_id="Multilandia.ru" site_id="multilandiya">Multilandia</channel>
     <channel lang="uk" xmltv_id="MuzhskoeKino.ru" site_id="muzhskoe_kino">Muzhskoe Kino</channel>
     <channel lang="uk" xmltv_id="MuzTV.ru" site_id="muz_tv">Muz TV</channel>
-    <channel lang="uk" xmltv_id="Nash.ua" site_id="nash">Nash</channel>
+    <channel lang="uk" xmltv_id="NASH.ua" site_id="nash">Nash</channel>
     <channel lang="uk" xmltv_id="NasheNovoeKino.ru" site_id="nashe_novoe-kino">Nashe Novoe Kino</channel>
     <channel lang="uk" xmltv_id="NationalGeographicRussia.ru" site_id="national_geographic">National Geographic Russia</channel>
     <channel lang="uk" xmltv_id="NationalGeographicWildRussia.ru" site_id="nat_geo_wild">National Geographic Wild Russia</channel>
@@ -104,7 +104,7 @@
     <channel lang="uk" xmltv_id="UACulture.ua" site_id="gtrk_kultura">UA: Kultura</channel>
     <channel lang="uk" xmltv_id="UAFirst.ua" site_id="ua_pervyj">UA: Pershiy</channel>
     <channel lang="uk" xmltv_id="UAZakarpattia.ua" site_id="ua_zakarpattya">UA: Zakarpattya</channel>
-    <channel lang="uk" xmltv_id="UnianTV.ua" site_id="unian_tb">Unian TV</channel>
+    <channel lang="uk" xmltv_id="UNIANTV.ua" site_id="unian_tb">Unian TV</channel>
     <channel lang="uk" xmltv_id="ViasatExplore.se" site_id="viasat_explore">Viasat Explore East</channel>
     <channel lang="uk" xmltv_id="ViasatHistory.se" site_id="viasat_history">Viasat History</channel>
     <channel lang="uk" xmltv_id="ViasatNature.se" site_id="viasat_nature">Viasat Nature East</channel>
diff --git a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
index 0f9c4d64..6ba96e73 100644
--- a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
+++ b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
@@ -106,7 +106,7 @@
     <channel lang="jp" xmltv_id="Star3.jp" site_id="120_202_4">Star 3</channel>
     <channel lang="jp" xmltv_id="StarBS10.jp" site_id="120_032_65406">Star BS10</channel>
     <channel lang="jp" xmltv_id="SuperDramaTV.jp" site_id="120_124_65534">Super! Drama TV</channel>
-    <channel lang="jp" xmltv_id="TabiChannel.jp" site_id="120_143_65406">Tabi Channel</channel>
+    <channel lang="jp" xmltv_id="TABIChannel.jp" site_id="120_143_65406">Tabi Channel</channel>
     <channel lang="jp" xmltv_id="TakarazukaSkyStage.jp" site_id="120_154_65406">Takarazuka Sky Stage</channel>
     <channel lang="jp" xmltv_id="TBSChannel1.jp" site_id="120_144_65406">TBS Channel 1</channel>
     <channel lang="jp" xmltv_id="TBSChannel2.jp" site_id="120_176_65406">TBS Channel 2</channel>
@@ -123,10 +123,10 @@
     <channel lang="jp" xmltv_id="TVSaitama.jp" site_id="2_29752_32295">TV Saitama</channel>
     <channel lang="jp" xmltv_id="VParadise.jp" site_id="120_195_65406">V Paradise</channel>
     <channel lang="jp" xmltv_id="Wowow4K.jp" site_id="3_191_11">Wowow 4K</channel>
-    <channel lang="jp" xmltv_id="WowowCinema.jp" site_id="3_193_4">Wowow Cinema</channel>
-    <channel lang="jp" xmltv_id="WowowLive.jp" site_id="3_192_4">Wowow Live</channel>
+    <channel lang="jp" xmltv_id="WOWOWCinema.jp" site_id="3_193_4">Wowow Cinema</channel>
+    <channel lang="jp" xmltv_id="WOWOWLive.jp" site_id="3_192_4">Wowow Live</channel>
     <channel lang="jp" xmltv_id="WowowPlus.jp" site_id="120_155_65406">Wowow Plus</channel>
-    <channel lang="jp" xmltv_id="WowowPrime.jp" site_id="3_191_4">Wowow Prime</channel>
+    <channel lang="jp" xmltv_id="WOWOWPrime.jp" site_id="3_191_4">Wowow Prime</channel>
     <channel lang="jp" xmltv_id="YoseChannel.jp" site_id="120_170_65406">Yose Channel</channel>
     <channel lang="jp" xmltv_id="TVOsaka.jp" site_id="2_41008_32118">テレビ大阪/TV Osaka</channel>
     <channel lang="jp" xmltv_id="JOUHDTV.jp" site_id="2_43056_32086">サンテレビジョン/Sun Television</channel>
@@ -134,7 +134,7 @@
     <channel lang="jp" xmltv_id="JODXDTV.jp" site_id="2_2080_32724">カンテレ/Kansai TV</channel>
     <channel lang="jp" xmltv_id="JOBRDTV.jp" site_id="2_42032_32102">KBS京都/Kyoto Broadcasting System</channel>
     <channel lang="jp" xmltv_id="JOAYDTV.jp" site_id="2_2072_32723">ABCテレビ/Asahi Broadcasting Kansai</channel>
-    <channel lang="jp" xmltv_id="BSShochiku.jp" site_id="120_103_65406">BS松竹東急/BS Shochiku Tokyu</channel>
+    <channel lang="jp" xmltv_id="BSShochikuTokyu.jp" site_id="120_103_65406">BS松竹東急/BS Shochiku Tokyu</channel>
     <channel lang="jp" xmltv_id="BSYoshimoto.jp" site_id="120_179_65406">BSよしもと/BS Yoshimoto</channel>
   </channels>
 </site>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 8c097c0d..60d6ccb2 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -460,7 +460,7 @@
     <channel lang="en" xmltv_id="PopWest.us" site_id="43377">Pop West</channel>
     <channel lang="en" xmltv_id="PositivTV.us" site_id="34169">Positiv TV</channel>
     <channel lang="en" xmltv_id="PursuitChannel.us" site_id="60111">Pursuit Channel</channel>
-    <channel lang="en" xmltv_id="QelloConcerts.us" site_id="113296">Qello Concerts by Stingray</channel>
+    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
     <channel lang="en" xmltv_id="Quest.us" site_id="106838">Quest</channel>
     <channel lang="en" xmltv_id="QVC.us" site_id="11069">QVC</channel>
     <channel lang="en" xmltv_id="QVC2.us" site_id="82682">QVC2</channel>
@@ -633,7 +633,7 @@
     <channel lang="en" xmltv_id="UniMasCentral.us" site_id="11523">UniMás Central</channel>
     <channel lang="en" xmltv_id="UniMasEast.us" site_id="29058">UniMás Este</channel>
     <channel lang="en" xmltv_id="UniMasWest.us" site_id="31541">Unimas West (National Feed)</channel>
-    <channel lang="en" xmltv_id="UniversalKids.us" site_id="47540">Universal Kids</channel>
+    <channel lang="en" xmltv_id="UniversalKidsEast.us" site_id="47540">Universal Kids</channel>
     <channel lang="en" xmltv_id="UnivisionEast.us" site_id="68049">Univision East (National Feed)</channel>
     <channel lang="en" xmltv_id="UnivisionTlnovelas.mx" site_id="74550">Univision Tlnovelas</channel>
     <channel lang="en" xmltv_id="UnivisionWest.us" site_id="14762">Univision West (National Feed)</channel>