diff --git a/sites/cosmote.gr/cosmote.gr_gr.channels.xml b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
index 852b1092..ce1cecdc 100644
--- a/sites/cosmote.gr/cosmote.gr_gr.channels.xml
+++ b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
@@ -17,21 +17,21 @@
     <channel lang="el" xmltv_id="CBSRealityEurope.us" site_id="cbs-reality">CBS Reality Europe</channel>
     <channel lang="el" xmltv_id="CNBCEurope.uk" site_id="cnbc">CNBC Europe</channel>
     <channel lang="el" xmltv_id="CNNInternationalEurope.us" site_id="cnn">CNN International Europe</channel>
-    <channel lang="el" xmltv_id="CosmoteCinema1.gr" site_id="ote-cinema-1">Cosmote Cinema 1</channel>
-    <channel lang="el" xmltv_id="CosmoteCinema2.gr" site_id="ote-cinema-2-hd">Cosmote Cinema 2</channel>
+    <channel lang="el" xmltv_id="CosmoteCinema1HD.gr" site_id="ote-cinema-1">Cosmote Cinema 1</channel>
+    <channel lang="el" xmltv_id="CosmoteCinema2HD.gr" site_id="ote-cinema-2-hd">Cosmote Cinema 2</channel>
     <channel lang="el" xmltv_id="CosmoteCinema3.gr" site_id="ote-cinema-3">Cosmote Cinema 3</channel>
-    <channel lang="el" xmltv_id="CosmoteHistory.gr" site_id="ote-history">Cosmote History</channel>
-    <channel lang="el" xmltv_id="CosmoteSeriesMarathon.gr" site_id="cosmote-series-marath-1">Cosmote Series Marathon</channel>
-    <channel lang="el" xmltv_id="CosmoteSport1.gr" site_id="ote-sport-1-hd">Cosmote Sport 1</channel>
-    <channel lang="el" xmltv_id="CosmoteSport2.gr" site_id="ote-sport-2-hd">Cosmote Sport 2</channel>
-    <channel lang="el" xmltv_id="CosmoteSport3.gr" site_id="ote-sport-3-hd">Cosmote Sport 3</channel>
-    <channel lang="el" xmltv_id="CosmoteSport4.gr" site_id="ote-sport-4-hd">Cosmote Sport 4</channel>
-    <channel lang="el" xmltv_id="CosmoteSport5.gr" site_id="ote-sport-5-hd">Cosmote Sport 5</channel>
-    <channel lang="el" xmltv_id="CosmoteSport6.gr" site_id="ote-sport-6-hd">Cosmote Sport 6</channel>
-    <channel lang="el" xmltv_id="CosmoteSport7.gr" site_id="ote-sport-7-hd">Cosmote Sport 7</channel>
-    <channel lang="el" xmltv_id="CosmoteSport8.gr" site_id="ote-sport-8-hd">Cosmote Sport 8</channel>
-    <channel lang="el" xmltv_id="CosmoteSport9.gr" site_id="cosmotesport9hd">Cosmote Sport 9</channel>
-    <channel lang="el" xmltv_id="CosmoteSportHighlights.gr" site_id="ote-sport-highlights-hd">Cosmote Sport Highlights</channel>
+    <channel lang="el" xmltv_id="CosmoteHistoryHD.gr" site_id="ote-history">Cosmote History</channel>
+    <channel lang="el" xmltv_id="CosmoteSeriesMarathonHD.gr" site_id="cosmote-series-marath-1">Cosmote Series Marathon</channel>
+    <channel lang="el" xmltv_id="CosmoteSport1HD.gr" site_id="ote-sport-1-hd">Cosmote Sport 1</channel>
+    <channel lang="el" xmltv_id="CosmoteSport2HD.gr" site_id="ote-sport-2-hd">Cosmote Sport 2</channel>
+    <channel lang="el" xmltv_id="CosmoteSport3HD.gr" site_id="ote-sport-3-hd">Cosmote Sport 3</channel>
+    <channel lang="el" xmltv_id="CosmoteSport4HD.gr" site_id="ote-sport-4-hd">Cosmote Sport 4</channel>
+    <channel lang="el" xmltv_id="CosmoteSport5HD.gr" site_id="ote-sport-5-hd">Cosmote Sport 5</channel>
+    <channel lang="el" xmltv_id="CosmoteSport6HD.gr" site_id="ote-sport-6-hd">Cosmote Sport 6</channel>
+    <channel lang="el" xmltv_id="CosmoteSport7HD.gr" site_id="ote-sport-7-hd">Cosmote Sport 7</channel>
+    <channel lang="el" xmltv_id="CosmoteSport8HD.gr" site_id="ote-sport-8-hd">Cosmote Sport 8</channel>
+    <channel lang="el" xmltv_id="CosmoteSport9HD.gr" site_id="cosmotesport9hd">Cosmote Sport 9</channel>
+    <channel lang="el" xmltv_id="CosmoteSportHighlightsHD.gr" site_id="ote-sport-highlights-hd">Cosmote Sport Highlights</channel>
     <channel lang="el" xmltv_id="CrimePlusInvestigationUK.uk" site_id="crime-and-investigation">Crime + Investigation UK</channel>
     <channel lang="el" xmltv_id="DisneyChannelMENA.uk" site_id="disney-channel">Disney Channel Middle East</channel>
     <channel lang="el" xmltv_id="DWEnglish.de" site_id="deutsche-welle">DW English</channel>
@@ -57,7 +57,7 @@
     <channel lang="el" xmltv_id="MadTV.gr" site_id="mad">Mad TV</channel>
     <channel lang="el" xmltv_id="MadViral.gr" site_id="mad-hits">Mad Viral</channel>
     <channel lang="el" xmltv_id="MakedoniaTV.gr" site_id="makedonia-tv">Makedonia TV</channel>
-    <channel lang="el" xmltv_id="MegaTV.gr" site_id="mega-hd">Mega TV</channel>
+    <channel lang="el" xmltv_id="MEGATVHD.gr" site_id="mega-hd">Mega TV</channel>
     <channel lang="el" xmltv_id="MezzoLiveHD.fr" site_id="mezzo">Mezzo Live HD</channel>
     <channel lang="el" xmltv_id="MotorvisionTV.de" site_id="motorvision-channel-hd">Motorvision TV</channel>
     <channel lang="el" xmltv_id="MTVGlobal.cz" site_id="mtv-europe">MTV Global</channel>
diff --git a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
index 6e1590fd..694f8e3e 100644
--- a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
+++ b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="tr" xmltv_id="CartoonNetworkTurkey.tr" site_id="58d29bb0eefad3db9c6062c8">Cartoon Network Türkiye</channel>
     <channel lang="tr" xmltv_id="CNNInternationalEurope.us" site_id="58d29bb0eefad3db9c6062b8">CNN International Europe</channel>
     <channel lang="tr" xmltv_id="CNNTurk.tr" site_id="59dca1f3cfef0b4d80a47a5f">CNN Türk</channel>
-    <channel lang="tr" xmltv_id="CocukSmart.tr" site_id="58d29bb0eefad3db9c6062b5">Çocuk Smart</channel>
+    <channel lang="tr" xmltv_id="CocukSmartHD.tr" site_id="58d29bb0eefad3db9c6062b5">Çocuk Smart</channel>
     <channel lang="tr" xmltv_id="DaVinci.de" site_id="58d29bb0eefad3db9c6062b6">Da Vinci</channel>
     <channel lang="tr" xmltv_id="DiscoveryChannelTurkey.us" site_id="58d29bb0eefad3db9c606248">Discovery Channel Türkiye</channel>
     <channel lang="tr" xmltv_id="DiscoveryScienceTurkey.us" site_id="58d29bb0eefad3db9c60628e">Discovery Science Türkiye</channel>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index 47700f2d..217d0b59 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="0porMPlus.es" site_id="_0">#0</channel>
+    <channel lang="es" xmltv_id="0porMovistarPlus.es" site_id="_0">#0</channel>
     <channel lang="es" xmltv_id="AMCSpain.us" site_id="amc_espana">AMC España</channel>
     <channel lang="es" xmltv_id="Antena3.es" site_id="antena_3_espana">Antena 3</channel>
     <channel lang="es" xmltv_id="Atreseries.es" site_id="atreseries_espana">Atreseries</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 f8c6a595..e7397868 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="m.tv.sms.cz">
   <channels>
-    <channel lang="cz" xmltv_id="0porMPlus.es" site_id="Cero">#0</channel>
+    <channel lang="cz" xmltv_id="0porMovistarPlus.es" site_id="Cero">#0</channel>
     <channel lang="cz" xmltv_id="360TuneBox.us" site_id="360TuneBox">360 Tune Box</channel>
     <channel lang="cz" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="cz" xmltv_id="4FunDance.pl" site_id="4Fun+Dance">4 Fun Dance</channel>
@@ -480,7 +480,7 @@
     <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>
+    <channel lang="cz" xmltv_id="TVOSEM.sk" site_id="TV8">TV Osem</channel>
     <channel lang="cz" xmltv_id="TVP1.pl" site_id="TVP1">TVP 1</channel>
     <channel lang="cz" xmltv_id="TVP2.pl" site_id="TVP2">TVP 2</channel>
     <channel lang="cz" xmltv_id="TVPABC.pl" site_id="TVP+ABC">TVP ABC</channel>
@@ -518,7 +518,7 @@
     <channel lang="cz" xmltv_id="VTV3.vn" site_id="VTV3">VTV 3</channel>
     <channel lang="cz" xmltv_id="VTV4.vn" site_id="VTV4">VTV 4</channel>
     <channel lang="cz" xmltv_id="WaterPlanet.pl" site_id="Water+Planet">Water Planet</channel>
-    <channel lang="cz" xmltv_id="WauTV.sk" site_id="WAU">Wau TV</channel>
+    <channel lang="cz" xmltv_id="TVWAU.sk" site_id="WAU">Wau TV</channel>
     <channel lang="cz" xmltv_id="Welt.de" site_id="Welt">Welt</channel>
     <channel lang="cz" xmltv_id="WildTV.ca" site_id="Wild+TV">Wild TV</channel>
     <channel lang="cz" xmltv_id="WPolscePL.pl" site_id="wPolsce.pl">W Polsce PL</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es.channels.xml b/sites/movistarplus.es/movistarplus.es_es.channels.xml
index e3f3a957..92985a01 100644
--- a/sites/movistarplus.es/movistarplus.es_es.channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="movistarplus.es">
   <channels>
-    <channel lang="es" xmltv_id="0porMPlus.es" site_id="MV3">#0</channel>
+    <channel lang="es" xmltv_id="0porMovistarPlus.es" site_id="MV3">#0</channel>
     <channel lang="es" xmltv_id="324.es" site_id="3_24">3/24</channel>
     <channel lang="es" xmltv_id="7TelevisionRegiondeMurcia.es" site_id="7TVMUR">7 Televisión Región de Murcia</channel>
     <channel lang="es" xmltv_id="8TVCadiz.es" site_id="8TV">8 TV Cádiz</channel>
@@ -125,9 +125,9 @@
     <channel lang="es" xmltv_id="MovistarLaLigaUHD.es" site_id="MLIGUH">Movistar LaLiga UHD</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones.es" site_id="CHAPIO">Movistar Liga de Campeones</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones1.es" site_id="CHAP1">Movistar Liga de Campeones 1</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones10.es" site_id="CHAP10">Movistar Liga de Campeones 10</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones11.es" site_id="CHAP11">Movistar Liga de Campeones 11</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones12.es" site_id="CHAP12">Movistar Liga de Campeones 12</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones10porMovistarPlus.es" site_id="CHAP10">Movistar Liga de Campeones 10</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones11porMovistarPlus.es" site_id="CHAP11">Movistar Liga de Campeones 11</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones12porMovistarPlus.es" site_id="CHAP12">Movistar Liga de Campeones 12</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones2.es" site_id="CHAP2">Movistar Liga de Campeones 2</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones3.es" site_id="CHAP3">Movistar Liga de Campeones 3</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones4.es" site_id="CHAP4">Movistar Liga de Campeones 4</channel>
@@ -135,9 +135,9 @@
     <channel lang="es" xmltv_id="MovistarLigadeCampeones6.es" site_id="CHAP6">Movistar Liga de Campeones 6</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones7.es" site_id="CHAP7">Movistar Liga de Campeones 7</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones8.es" site_id="CHAP8">Movistar Liga de Campeones 8</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones9.es" site_id="CHAP9">Movistar Liga de Campeones 9</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones9porMovistarPlus.es" site_id="CHAP9">Movistar Liga de Campeones 9</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeonesUHD.es" site_id="CHAUHD">Movistar Liga de Campeones UHD</channel>
-    <channel lang="es" xmltv_id="MovistarLosOscar.es" site_id="MOSCAR">Movistar Los Oscar</channel>
+    <channel lang="es" xmltv_id="OscarsporMovistarPlus.es" site_id="MOSCAR">Movistar Los Oscar</channel>
     <channel lang="es" xmltv_id="MovistarSeries.es" site_id="MV2">Movistar Series</channel>
     <channel lang="es" xmltv_id="MovistarSeries2.es" site_id="CPSER">Movistar  Series 2</channel>
     <channel lang="es" xmltv_id="MTV00s.uk" site_id="VH1">MTV 00s</channel>
@@ -182,7 +182,7 @@
     <channel lang="es" xmltv_id="tvG2.es" site_id="TVG2">tvG2</channel>
     <channel lang="es" xmltv_id="TVGEuropa.es" site_id="TVG">TVG Europa</channel>
     <channel lang="es" xmltv_id="UBeat.mx" site_id="UBEAT">U-Beat</channel>
-    <channel lang="es" xmltv_id="VamosporMPlus.es" site_id="VAMOSD">#Vamos</channel>
-    <channel lang="es" xmltv_id="Xtrm.es" site_id="XTRM">Xtrm</channel>
+    <channel lang="es" xmltv_id="VamosporMovistarPlus.es" site_id="VAMOSD">#Vamos</channel>
+    <channel lang="es" xmltv_id="XTRM.es" site_id="XTRM">Xtrm</channel>
   </channels>
 </site>
\ No newline at end of file
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 ba90cdd0..1c21e038 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
@@ -109,6 +109,6 @@
     <channel lang="es" xmltv_id="VePlusPanregional.ve" site_id="653">Ve Plus Panregional</channel>
     <channel lang="es" xmltv_id="VH1Europe.uk" site_id="165">VH1 Europe</channel>
     <channel lang="es" xmltv_id="Viajar.es" site_id="188">Viajar</channel>
-    <channel lang="es" xmltv_id="Xtrm.es" site_id="68">Xtrm</channel>
+    <channel lang="es" xmltv_id="XTRM.es" site_id="68">Xtrm</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/rotana.net/rotana.net_sa.channels.xml b/sites/rotana.net/rotana.net_sa.channels.xml
index cbe7682f..31fbff1a 100644
--- a/sites/rotana.net/rotana.net_sa.channels.xml
+++ b/sites/rotana.net/rotana.net_sa.channels.xml
@@ -2,7 +2,7 @@
 <site site="rotana.net">
   <channels>
     <channel lang="ar" xmltv_id="LBC.sa" site_id="LBC-17">LBC</channel>
-    <channel lang="ar" xmltv_id="RotanaAflamPlus.sa" site_id="AFLAM-">Rotana Aflam+</channel>
+    <channel lang="ar" xmltv_id="RotanaAflamPlusHD.sa" site_id="AFLAM-">Rotana Aflam+</channel>
     <channel lang="ar" xmltv_id="RotanaAmerica.sa" site_id="AMERICA-13">Rotana America</channel>
     <channel lang="ar" xmltv_id="RotanaCinemaEgypt.eg" site_id="CINEMA-EGY-13">Rotana Cinema Egypt</channel>
     <channel lang="ar" xmltv_id="RotanaCinemaKSA.sa" site_id="CINEMA-12">Rotana Cinema KSA</channel>
@@ -11,6 +11,6 @@
     <channel lang="ar" xmltv_id="RotanaDrama.sa" site_id="DRAMA-15">Rotana Drama</channel>
     <channel lang="ar" xmltv_id="RotanaKhalijia.sa" site_id="KHALIJIA-13">Rotana Khalejia</channel>
     <channel lang="ar" xmltv_id="RotanaKids.sa" site_id="KIDS-14">Rotana Kids</channel>
-    <channel lang="ar" xmltv_id="RotanaPlus.sa" site_id="ROTANA-HD-13">Rotana+</channel>
+    <channel lang="ar" xmltv_id="RotanaPlusHD.sa" site_id="ROTANA-HD-13">Rotana+</channel>
   </channels>
 </site>
\ No newline at end of file
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 04d80465..32a522c1 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="CI">Crime &amp; Investigation HD</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="DVL">Da Vinci</channel>
-    <channel lang="id" xmltv_id="DaAiTVIndonesia.id" site_id="DAAI">DAAI TV</channel>
+    <channel lang="id" xmltv_id="DAAITV.id" site_id="DAAI">DAAI TV</channel>
     <channel lang="id" xmltv_id="DuckTV.sk" site_id="DUCK">Duck TV</channel>
     <channel lang="id" xmltv_id="DuniaAnak.id" site_id="AND">Dunia Anak</channel>
     <channel lang="id" xmltv_id="DuniaLain.id" site_id="TRDU">Dunia Lain</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 31586bd1..e3028306 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="ru" xmltv_id="Bober.ru" site_id="213#bober-1171">Bober</channel>
     <channel lang="ru" xmltv_id="BoksTV.ru" site_id="213#boks-tv-1095">Boks TV</channel>
     <channel lang="ru" xmltv_id="BollywoodHDRussia.ru" site_id="213#bollywood-hd-1105">Bollywood HD</channel>
-    <channel lang="ru" xmltv_id="BolshayaAziya.ru" site_id="213#bolshaya-aziya-116">Bolshaya Aziya</channel>
+    <channel lang="ru" xmltv_id="BigAsia.ru" site_id="213#bolshaya-aziya-116">Bolshaya Aziya</channel>
     <channel lang="ru" xmltv_id="BoomerangCentralEasternEurope.us" site_id="213#boomerang-741">Boomerang Central &amp; Eastern Europe</channel>
     <channel lang="ru" xmltv_id="BridgeTV.ru" site_id="213#bridge-tv-102">Bridge TV</channel>
     <channel lang="ru" xmltv_id="BridgeTVRusskiyHit.ru" site_id="213#bridge-tv-russkiy-hit-608">Bridge TV Russkiy Hit</channel>
diff --git a/sites/vidio.com/vidio.com_id.channels.xml b/sites/vidio.com/vidio.com_id.channels.xml
index 42542b51..6f31ceac 100644
--- a/sites/vidio.com/vidio.com_id.channels.xml
+++ b/sites/vidio.com/vidio.com_id.channels.xml
@@ -19,7 +19,7 @@
     <channel lang="id" xmltv_id="CitraEntertainment.id" site_id="6402">Citra Entertainment</channel>
     <channel lang="id" xmltv_id="CitraMuslim.id" site_id="6678">Citra Muslim</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="6411">CNA</channel>
-    <channel lang="id" xmltv_id="DaAiTVIndonesia.id" site_id="6482">Da Ai TV</channel>
+    <channel lang="id" xmltv_id="DAAITV.id" site_id="6482">Da Ai TV</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="6549">Da Vinci Asia</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="5075">DW English</channel>
     <channel lang="id" xmltv_id="EuronewsEnglish.fr" site_id="6412">EuroNews English</channel>