From 69dff7eec177ac5d74d0da15354cb526dc93c9ec Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:28:37 +0300
Subject: [PATCH] Fixes xmltv_id

---
 .../canalplus.com/canalplus.com.channels.xml  |  4 +--
 .../chaines-tv.orange.fr.channels.xml         |  4 +--
 .../firstmedia.com.channels.xml               |  2 +-
 .../guidatv.sky.it.channels.xml               |  2 +-
 sites/hd-plus.de/hd-plus.de.channels.xml      | 20 ++++++-------
 sites/horizon.tv/horizon.tv.channels.xml      |  4 +--
 .../indihometv.com.channels.xml               |  2 +-
 sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml    | 14 ++++-----
 .../maxtv.hrvatskitelekom.hr.channels.xml     |  2 +-
 sites/meo.pt/meo.pt.channels.xml              |  6 ++--
 sites/moji.id/moji.id.channels.xml            |  2 +-
 .../mon-programme-tv.be.channels.xml          |  2 +-
 .../mujtvprogram.cz.channels.xml              |  6 ++--
 sites/musor.tv/musor.tv.channels.xml          |  2 +-
 sites/nos.pt/nos.pt.channels.xml              |  2 +-
 sites/plex.tv/plex.tv.channels.xml            |  2 +-
 .../programacion-tv.elpais.com.channels.xml   |  2 +-
 .../programetv.ro/programetv.ro.channels.xml  |  8 ++---
 .../programme-tv.net.channels.xml             |  4 +--
 .../programtv.onet.pl.channels.xml            | 14 ++++-----
 .../proximusmwc.be.channels.xml               |  2 +-
 .../startimestv.com.channels.xml              |  2 +-
 .../superguidatv.it.channels.xml              |  2 +-
 .../telecablesat.fr.channels.xml              |  4 +--
 sites/teliatv.ee/teliatv.ee_en.channels.xml   |  4 +--
 sites/teliatv.ee/teliatv.ee_et.channels.xml   |  4 +--
 sites/teliatv.ee/teliatv.ee_ru.channels.xml   |  4 +--
 sites/tv.blue.ch/tv.blue.ch.channels.xml      | 30 +++++++++----------
 sites/tv.nu/tv.nu.channels.xml                |  4 +--
 sites/tv.post.lu/tv.post.lu.channels.xml      | 18 +++++------
 sites/tv24.se/tv24.se.channels.xml            |  2 +-
 .../tv2go.t-2.net/tv2go.t-2.net.channels.xml  |  4 +--
 sites/tvgids.nl/tvgids.nl.channels.xml        |  2 +-
 sites/tvheute.at/tvheute.at.channels.xml      | 22 +++++++-------
 sites/tvprofil.com/tvprofil.com.channels.xml  |  6 ++--
 sites/tvtv.us/tvtv.us.channels.xml            |  2 +-
 sites/vidio.com/vidio.com.channels.xml        |  2 +-
 sites/vivacom.bg/vivacom.bg.channels.xml      |  2 +-
 .../web.magentatv.de.channels.xml             | 22 +++++++-------
 .../webtv.delta.nl.channels.xml               |  2 +-
 sites/ziggogo.tv/ziggogo.tv.channels.xml      |  2 +-
 41 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/sites/canalplus.com/canalplus.com.channels.xml b/sites/canalplus.com/canalplus.com.channels.xml
index f450e250..0454c5dc 100644
--- a/sites/canalplus.com/canalplus.com.channels.xml
+++ b/sites/canalplus.com/canalplus.com.channels.xml
@@ -11251,7 +11251,7 @@
   <channel site="canalplus.com" lang="fr" xmltv_id="AlJazeeraEnglish.qa" site_id="#675">AL JAZEERA ENG</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="Animaux.fr" site_id="#503">ANIMAUX</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="ArirangWorld.kr" site_id="#252">ARIRANG TV</channel>
-  <channel site="canalplus.com" lang="fr" xmltv_id="ARTE.fr" site_id="#154">ARTE</channel>
+  <channel site="canalplus.com" lang="fr" xmltv_id="arte.fr" site_id="#154">ARTE</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="AstrocenterTV.fr" site_id="#632">ASTROCENTER TV</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="Automotolachaine.fr" site_id="#612">AUTOMOTO LA CHAINE</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="BBCNewsEurope.uk" site_id="#589">BBC NEWS</channel>
@@ -11364,7 +11364,7 @@
   <channel site="canalplus.com" lang="fr" xmltv_id="GolfPlus.fr" site_id="#378">GOLF+</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="Gulli.fr" site_id="#549">GULLI</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="HistoireTV.fr" site_id="#550">HISTOIRE TV</channel>
-  <channel site="canalplus.com" lang="fr" xmltv_id="I24NewsFrench.il" site_id="#362">I24 NEWS</channel>
+  <channel site="canalplus.com" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="#362">I24 NEWS</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="InfosportPlus.fr" site_id="#551">INFOSPORT+</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="JOne.fr" site_id="#484">J-ONE</channel>
   <channel site="canalplus.com" lang="fr" xmltv_id="LaChaineMeteo.fr" site_id="#552">LA CHAINE METEO</channel>
diff --git a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.channels.xml b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.channels.xml
index 2c981734..fb0741f0 100644
--- a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.channels.xml
+++ b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.channels.xml
@@ -152,7 +152,7 @@
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="Action.fr" site_id="10">ACTION</channel>
   <channel site="chaines-tv.orange.fr" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="525">AL JAZEERA Anglais</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="Animaux.fr" site_id="12">ANIMAUX</channel>
-  <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="ARTE.fr" site_id="111">ARTE</channel>
+  <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="arte.fr" site_id="111">ARTE</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="Automotolachaine.fr" site_id="15">AUTOMOTO, la chaine</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="BBCEntertainment.uk" site_id="18">BBC ENTERTAINMENT</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="BBCNewsEurope.uk" site_id="19">BBC NEWS</channel>
@@ -218,7 +218,7 @@
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="GolfChannel.fr" site_id="1166">GOLF CHANNEL</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="Gulli.fr" site_id="482">GULLI</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="HistoireTV.fr" site_id="88">HISTOIRE TV</channel>
-  <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="I24NewsFrench.il" site_id="781">I24NEWS</channel>
+  <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="781">I24NEWS</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="JOne.fr" site_id="1585">J-ONE</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="KTO.fr" site_id="110">KTO</channel>
   <channel site="chaines-tv.orange.fr" lang="fr" xmltv_id="LCI.fr" site_id="112">LCI</channel>
diff --git a/sites/firstmedia.com/firstmedia.com.channels.xml b/sites/firstmedia.com/firstmedia.com.channels.xml
index 77a2db8c..55520fa3 100644
--- a/sites/firstmedia.com/firstmedia.com.channels.xml
+++ b/sites/firstmedia.com/firstmedia.com.channels.xml
@@ -85,7 +85,7 @@
   <channel site="firstmedia.com" lang="en" xmltv_id="NHKWorldPremium.jp" site_id="247">NHK World Premium</channel>
   <channel site="firstmedia.com" lang="en" xmltv_id="NickelodeonAsia.sg" site_id="125">Nickelodeon</channel>
   <channel site="firstmedia.com" lang="en" xmltv_id="NickJrAsia.sg" site_id="124">Nick jr.</channel>
-  <channel site="firstmedia.com" lang="en" xmltv_id="OChannel.id" site_id="26">MOJI</channel>
+  <channel site="firstmedia.com" lang="en" xmltv_id="Moji.id" site_id="26">MOJI</channel>
   <channel site="firstmedia.com" lang="en" xmltv_id="ONE.sg" site_id="205">ONE</channel>
   <channel site="firstmedia.com" lang="en" xmltv_id="ParamountNetwork.id" site_id="309">Paramount Network HD</channel>
   <channel site="firstmedia.com" lang="en" xmltv_id="PhoenixChineseChannel.hk" site_id="203">Phoenix Chinese Channel</channel>
diff --git a/sites/guidatv.sky.it/guidatv.sky.it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it.channels.xml
index adca753d..5d4b02af 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it.channels.xml
@@ -64,7 +64,7 @@
   <channel site="guidatv.sky.it" lang="it" xmltv_id="HistoryHD.it" site_id="DTH#9101">History HD</channel>
   <channel site="guidatv.sky.it" lang="it" xmltv_id="HistoryPlus1.it" site_id="DTH#123">History +1</channel>
   <channel site="guidatv.sky.it" lang="it" xmltv_id="HorseTVHD.it" site_id="DTH#6611">Horse TV HD</channel>
-  <channel site="guidatv.sky.it" lang="it" xmltv_id="I24NewsEnglish.il" site_id="DTH#8273">i24news</channel>
+  <channel site="guidatv.sky.it" lang="it" xmltv_id="i24NEWSEnglishWorld.il" site_id="DTH#8273">i24news</channel>
   <channel site="guidatv.sky.it" lang="it" xmltv_id="InterTV.it" site_id="DTH#9893">Inter TV</channel>
   <channel site="guidatv.sky.it" lang="it" xmltv_id="IrisHD.it" site_id="DTH#10467">Iris HD</channel>
   <channel site="guidatv.sky.it" lang="it" xmltv_id="Italia1HD.it" site_id="DTH#10454">Italia 1 HD</channel>
diff --git a/sites/hd-plus.de/hd-plus.de.channels.xml b/sites/hd-plus.de/hd-plus.de.channels.xml
index bb29ac23..071ddece 100644
--- a/sites/hd-plus.de/hd-plus.de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de.channels.xml
@@ -5,7 +5,7 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="3sat.de" site_id="3sat-hd">3sat</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="AnixeHDSerie.de" site_id="anixe-hd">Anixe HD Serie</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ARDalpha.de" site_id="ard-alpha">ARD Alpha</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="ARTE.de" site_id="arte-hd">ARTE Deutsch</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="arte.de" site_id="arte-hd">ARTE Deutsch</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="AstroTV.de" site_id="astrotv">AstroTV</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ATV.at" site_id="atv-hd">ATV</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ATV2.at" site_id="atv2">ATV 2</channel>
@@ -33,14 +33,14 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="Heimatkanal.de" site_id="heimatkanal">Heimatkanal</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="History.de" site_id="history-hd">History Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="HopeChannelGerman.de" site_id="hope-channel">Hope TV Deutsch</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="HRFernsehen.de" site_id="hr-fernsehen-hd">HR Fernsehen</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="hrfernsehen.de" site_id="hr-fernsehen-hd">HR Fernsehen</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="HSE.de" site_id="hse24-hd">HSE</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="HSEExtra.de" site_id="hse24-extra-hd">HSE Extra</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="JMLDirectTV.uk" site_id="jml">JML Direct</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Junior.de" site_id="junior">Junior</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Juwelo.de" site_id="juwelo-hd">Juwelo</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="kabeleins.de" site_id="kabel-eins-hd">Kabel Eins Deutschland</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="kabeleinsclassics.de" site_id="kabel-eins-classics">Kabel Eins Classics</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="kabeleinsClassics.de" site_id="kabel-eins-classics">Kabel Eins Classics</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="KiKA.de" site_id="kika-hd">KIKA</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="KinoweltTV.de" site_id="kinowelt-tv">Kinowelt TV</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="KTV.at" site_id="k-tv">K-TV</channel>
@@ -62,11 +62,11 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="ORFIII.at" site_id="orf-iii-hd">ORF III</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ORFSportPlus.at" site_id="orf-sport-plus-hd">ORF Sport +</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="PearlTV.de" site_id="pearl-tv-hd">Pearl TV</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="Phoenix.de" site_id="phoenix-hd">Phoenix</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="phoenix.de" site_id="phoenix-hd">Phoenix</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ProSieben.de" site_id="prosieben-hd">ProSieben Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ProSiebenMaxx.de" site_id="prosieben-maxx-hd">ProSieben Maxx Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Puls4.at" site_id="puls-4-hd">Puls 4</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="QVC2.de" site_id="qvc-plus-hd">QVC Zwei</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="QVCZweiHD.de" site_id="qvc-plus-hd">QVC Zwei</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="QVC.de" site_id="qvc-hd">QVC Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="RFO.de" site_id="rfo">RFO</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="RheinMainTV.de" site_id="rhein-main-tv">RheinMain TV</channel>
@@ -78,9 +78,9 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="RTLZwei.de" site_id="rtl-ii-hd">RTL Zwei Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SAT1.de" site_id="sat-1-hd">Sat. 1 Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SAT1emotions.de" site_id="sat-1-emotions">Sat. 1 Emotions</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="SAT1GOLD.de" site_id="sat-1-gold-hd">Sat. 1 Gold Deutschland</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="SAT1Gold.de" site_id="sat-1-gold-hd">Sat. 1 Gold Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="ServusTVDeutschland.de" site_id="servustv-hd-deutschland">Servus TV Deutschland</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="Sixx.de" site_id="sixx-hd">Sixx Deutschland</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="sixx.de" site_id="sixx-hd">Sixx Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SkyAtlantic.de" site_id="sky-atlantic-hd">Sky Atlantic</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SkyCinemaAction.de" site_id="sky-action-hd">Sky Cinema Action</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SkyCinemaBestOf.de" site_id="sky-hits-hd">Sky Cinema Hits</channel>
@@ -99,15 +99,15 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="AXNBlack.de" site_id="axn-hd">Sony AXN</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Sport1.de" site_id="sport1-hd">Sport 1</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Sport1Plus.de" site_id="sport1-plus-hd">Sport 1+</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="Sportdigital.de" site_id="sportdigital">Sportdigital Fussball</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="SportdigitalFUSSBALL.de" site_id="sportdigital">Sportdigital Fussball</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SRF1.ch" site_id="srf-1-hd">SRF 1</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SRFernsehen.de" site_id="sr-fernsehen-hd">SR Fernsehen</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SRFzwei.ch" site_id="srf-zwei-hd">SRF Zwei</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="StingrayClassica.ca" site_id="classica">Stingray Classica</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="SuperRTL.de" site_id="super-rtl-hd">Super RTL Deutschland</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="RTLSuper.de" site_id="super-rtl-hd">Super RTL Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="SYFY.de" site_id="syfy-hd">Syfy Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="tagesschau24.de" site_id="tagesschau24-hd">Tagesschau 24</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="Tele5.de" site_id="tele-5-hd">Tele 5</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="TELE5.de" site_id="tele-5-hd">Tele 5</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="TLC.de" site_id="tlc-hd">TLC Germany</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="WarnerTVFilm.de" site_id="tnt-film">TNT Film</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="WarnerTVSerieHD.de" site_id="tnt-serie-hd">TNT Serie</channel>
diff --git a/sites/horizon.tv/horizon.tv.channels.xml b/sites/horizon.tv/horizon.tv.channels.xml
index da282384..de5c6974 100644
--- a/sites/horizon.tv/horizon.tv.channels.xml
+++ b/sites/horizon.tv/horizon.tv.channels.xml
@@ -9,7 +9,7 @@
   <channel site="horizon.tv" lang="de" xmltv_id="RTL.de" site_id="10166">RTL DE</channel>
   <channel site="horizon.tv" lang="de" xmltv_id="RTLZwei.de" site_id="10167">RTL Zwei</channel>
   <channel site="horizon.tv" lang="de" xmltv_id="SAT1.de" site_id="10169">SAT 1</channel>
-  <channel site="horizon.tv" lang="de" xmltv_id="SuperRTL.de" site_id="10168">Super RTL</channel>
+  <channel site="horizon.tv" lang="de" xmltv_id="RTLSuper.de" site_id="10168">Super RTL</channel>
   <channel site="horizon.tv" lang="de" xmltv_id="VOX.de" site_id="10170">VOX</channel>
   <channel site="horizon.tv" lang="de" xmltv_id="WELT.de" site_id="10164">WELT</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="360TuneBox.nl" site_id="10200">360 TuneBox HD</channel>
@@ -55,7 +55,7 @@
   <channel site="horizon.tv" lang="sk" xmltv_id="AMC.cz" site_id="10024">AMC HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="AnimalPlanetEurope.uk" site_id="10049">Animal Planet HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="ATV.hu" site_id="10147">Magyar ATV</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="AutoMotorundSport.de" site_id="10077">Auto Motor Sport</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="automotorundsportchannel.de" site_id="10077">Auto Motor Sport</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="BarrandovKrimi.cz" site_id="10033">Barrandov Krimi HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="Bober.ru" site_id="10178">Bober</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="Carousel.ru" site_id="10180">Carousel</channel>
diff --git a/sites/indihometv.com/indihometv.com.channels.xml b/sites/indihometv.com/indihometv.com.channels.xml
index e4110706..58d34188 100644
--- a/sites/indihometv.com/indihometv.com.channels.xml
+++ b/sites/indihometv.com/indihometv.com.channels.xml
@@ -88,7 +88,7 @@
   <channel site="indihometv.com" lang="id" xmltv_id="NickJrAsia.sg" site_id="nickjr">Nick Junior</channel>
   <channel site="indihometv.com" lang="id" xmltv_id="nsert.id" site_id="insert">Insert</channel>
   <channel site="indihometv.com" lang="id" xmltv_id="NusantaraTV.id" site_id="nusantaratv">Nusantara TV</channel>
-  <channel site="indihometv.com" lang="id" xmltv_id="OChannel.id" site_id="ochannel">MOJI</channel>
+  <channel site="indihometv.com" lang="id" xmltv_id="Moji.id" site_id="ochannel">MOJI</channel>
   <channel site="indihometv.com" lang="id" xmltv_id="ONE.sg" site_id="sone">SONE</channel>
   <channel site="indihometv.com" lang="id" xmltv_id="ParamountNetwork.id" site_id="paramount">Paramount</channel>
   <channel site="indihometv.com" lang="id" xmltv_id="Prambors.id" site_id="pramborstv">Prambors</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index e9f494c7..14a0d73f 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -513,7 +513,7 @@
   <channel site="m.tv.sms.cz" lang="bs" xmltv_id="BNTV.ba" site_id="BN+Televizija">BN Televizija</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AMC.cz" site_id="AMC">AMC</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AnimalPlanetEurope.uk" site_id="AnimalPlanet">AnimalPlanet</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AutoMotorundSport.de" site_id="Auto+Motor+Sport">Auto Motor Sport</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="automotorundsportchannel.de" site_id="Auto+Motor+Sport">Auto Motor Sport</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AXNBlack.us" site_id="AXN+Black">AXN Black</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AXNEurope.gr" site_id="AXN">AXN</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="AXNWhite.us" site_id="AXN+White">AXN White</channel>
@@ -726,7 +726,7 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RaiSportHD.it" site_id="Rai+Sport+2">Rai Sport 2</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RaiStoria.it" site_id="Rai+Storia">Rai Storia</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RaiYoyo.it" site_id="Rai+Yoyo">Rai Yoyo</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RBBBerlin.de" site_id="RBB+Berlin">RBB Berlin</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="rbbFernsehenBerlin.de" site_id="RBB+Berlin">RBB Berlin</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Rebel.cz" site_id="Rebel">Rebel</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RedCarpetTV.pl" site_id="Red+Carpet">Red Carpet</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RedlightHD.nl" site_id="Redlight+HD">Redlight HD</channel>
@@ -751,9 +751,9 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RTVi.ru" site_id="RTVi">RTVi</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Russia24.ru" site_id="Russia+24">Russia 24</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SAT1.de" site_id="SAT1">SAT1</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SAT1GOLD.de" site_id="SAT1+Gold">SAT1 Gold</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SAT1Gold.de" site_id="SAT1+Gold">SAT1 Gold</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Senzi.sk" site_id="SENZI">SENZI</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Sixx.de" site_id="Sixx">Sixx</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="sixx.de" site_id="Sixx">Sixx</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SlagerMuzika.cz" site_id="%8Al%E1gr+Muzika">lgr Muzika</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SlagerOriginal.cz" site_id="%8Al%E1gr+Origin%E1l">lgr Originl</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SlagerPremium.cz" site_id="%8Al%E1gr+Premium">lgr Premium</channel>
@@ -773,7 +773,7 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="StopklatkaTV.pl" site_id="Stopklatka+TV">Stopklatka TV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Story4.hu" site_id="Story4">Story4</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SuperPolsat.pl" site_id="Super+Polsat">Super Polsat</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SuperRTL.de" site_id="Super+RTL">Super RTL</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="RTLSuper.de" site_id="Super+RTL">Super RTL</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SuperTV2.hu" site_id="SuperTV2">SuperTV2</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="SuperyachtTV.mc" site_id="Superyacht">Superyacht</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="TA3.sk" site_id="TA3">TA3</channel>
@@ -859,10 +859,10 @@
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="ARDalpha.de" site_id="ARD-alpha">ARD-alpha</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="DasErste.de" site_id="ARD">ARD</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="DisneyChannel.de" site_id="Disney+Channel+%28de%29">Disney Channel (de)</channel>
-  <channel site="m.tv.sms.cz" lang="de" xmltv_id="HRFernsehen.de" site_id="HR-fernsehen">HR-fernsehen</channel>
+  <channel site="m.tv.sms.cz" lang="de" xmltv_id="hrfernsehen.de" site_id="HR-fernsehen">HR-fernsehen</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="KiKA.de" site_id="Kika">Kika</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="Nitro.de" site_id="RTL+Nitro">RTL Nitro</channel>
-  <channel site="m.tv.sms.cz" lang="de" xmltv_id="Phoenix.de" site_id="Phoenix">Phoenix</channel>
+  <channel site="m.tv.sms.cz" lang="de" xmltv_id="phoenix.de" site_id="Phoenix">Phoenix</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="RTL.de" site_id="RTL">RTL</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="WELT.de" site_id="Welt">Welt</channel>
   <channel site="m.tv.sms.cz" lang="de" xmltv_id="ZDF.de" site_id="ZDF">ZDF</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
index 90be4470..770e2b21 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
@@ -251,7 +251,7 @@
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="RTS3.rs" site_id="721">RTS 3</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="RTSSvet.rs" site_id="277">RTS Svet</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="SportskaTV.hr" site_id="96">Sportska televizija</channel>
-  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="SuperRTL.de" site_id="323">Super RTL</channel>
+  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="RTLSuper.de" site_id="323">Super RTL</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="TRTWorld.tr" site_id="773">TRT WORLD</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="TVCGMNE.me" site_id="282">TVCG MNE</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="263">TVE Internacional</channel>
diff --git a/sites/meo.pt/meo.pt.channels.xml b/sites/meo.pt/meo.pt.channels.xml
index 3c3a4c04..b8edcd96 100644
--- a/sites/meo.pt/meo.pt.channels.xml
+++ b/sites/meo.pt/meo.pt.channels.xml
@@ -95,7 +95,7 @@
   <channel site="meo.pt" lang="pt" xmltv_id="ABolaTV.pt" site_id="ABOLA">A Bola TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="AfroMusicChannel.pt" site_id="AFRO">Afro Music</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="AlmaLusa.pt" site_id="ALMALUS">Alma Lusa</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="ARTE.fr" site_id="ARTEHD">Arte</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="arte.fr" site_id="ARTEHD">Arte</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="ARTV.pt" site_id="ARTV">ARTV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="BabyTV.uk" site_id="BABYT">Baby TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="BBCEntertainment.uk" site_id="BBC E">BBC Entertainment</channel>
@@ -141,8 +141,8 @@
   <channel site="meo.pt" lang="pt" xmltv_id="GloboNews.br" site_id="GNEWS">Globo News</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="HotMan.pt" site_id="HOTMAN">HOT Man</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="HotTaboo.pt" site_id="HOTTAB">HOT Taboo</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="I24NewsEnglish.il" site_id="I24I">i24 News (I)</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="I24NewsFrench.il" site_id="I24F">i24 News (F)</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="i24NEWSEnglishWorld.il" site_id="I24I">i24 News (I)</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="i24NEWSFrench.il" site_id="I24F">i24 News (F)</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="KiKA.de" site_id="KIKA">KIKA</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="KuriakosTV.pt" site_id="KURIAKO">Kuriakos TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="LollyKids.uk" site_id="LOLLY">Lolly kids</channel>
diff --git a/sites/moji.id/moji.id.channels.xml b/sites/moji.id/moji.id.channels.xml
index 61747315..bd1c7d55 100644
--- a/sites/moji.id/moji.id.channels.xml
+++ b/sites/moji.id/moji.id.channels.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <channels>
-  <channel site="moji.id" lang="en" xmltv_id="OChannel.id" site_id="0">Moji</channel>
+  <channel site="moji.id" lang="en" xmltv_id="Moji.id" site_id="0">Moji</channel>
 </channels>
\ No newline at end of file
diff --git a/sites/mon-programme-tv.be/mon-programme-tv.be.channels.xml b/sites/mon-programme-tv.be/mon-programme-tv.be.channels.xml
index 35cd8522..c0c9aac2 100644
--- a/sites/mon-programme-tv.be/mon-programme-tv.be.channels.xml
+++ b/sites/mon-programme-tv.be/mon-programme-tv.be.channels.xml
@@ -15,7 +15,7 @@
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="Action.fr" site_id="63/programme-television-action">ACTION</channel>
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="AlticeStudio.fr" site_id="1723/programme-television-altice-studio">ALTICE STUDIO</channel>
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="Animaux.fr" site_id="89/programme-television-animaux">ANIMAUX</channel>
-  <channel site="mon-programme-tv.be" lang="fr" xmltv_id="ARTE.fr" site_id="14/programme-television-arte">ARTE</channel>
+  <channel site="mon-programme-tv.be" lang="fr" xmltv_id="arte.fr" site_id="14/programme-television-arte">ARTE</channel>
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="Automotolachaine.fr" site_id="138/programme-television-automoto">AUTOMOTO</channel>
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="BBCEntertainment.uk" site_id="119/programme-television-bbc-entertainment">BBC ENTERTAINMENT</channel>
   <channel site="mon-programme-tv.be" lang="fr" xmltv_id="Be1.be" site_id="298/programme-television-be-1">BE 1</channel>
diff --git a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
index 4753810a..b357a4e3 100644
--- a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
+++ b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
@@ -48,8 +48,8 @@
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="3sat.de" site_id="46">3SAT</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AMC.cz" site_id="394">AMC</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AnimalPlanetEurope.uk" site_id="11">Animal Planet</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="ARTE.de" site_id="47">ARTE</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AutoMotorundSport.de" site_id="315">Auto Motor Sport HD</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="arte.de" site_id="47">ARTE</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="automotorundsportchannel.de" site_id="315">Auto Motor Sport HD</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AXNBlack.us" site_id="369">AXN Black</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AXNEurope.gr" site_id="9">AXN</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="AXNWhite.us" site_id="370">AXN White</channel>
@@ -163,7 +163,7 @@
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="RTL.hu" site_id="259">RTL Hungary</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="RTLZwei.de" site_id="50">RTL2</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="SAT1.de" site_id="52">SAT.1</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="SAT1GOLD.de" site_id="408">SAT.1 Gold</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="SAT1Gold.de" site_id="408">SAT.1 Gold</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Skylink7.sk" site_id="723">Skylink 7</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="SlagerOriginal.cz" site_id="389">Šláger Originál</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="SlagerPremium.cz" site_id="841">Šlágr Premium HD</channel>
diff --git a/sites/musor.tv/musor.tv.channels.xml b/sites/musor.tv/musor.tv.channels.xml
index f9395eb2..e289c475 100644
--- a/sites/musor.tv/musor.tv.channels.xml
+++ b/sites/musor.tv/musor.tv.channels.xml
@@ -27,7 +27,7 @@
   <channel site="musor.tv" lang="hu" xmltv_id="Arena4.hu" site_id="ARENA4">Arena4</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="ATV.hu" site_id="ATV">ATV</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="ATVSpirit.hu" site_id="ATV_SPIRIT">ATV Spirit</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="AutoMotorundSport.de" site_id="AUTO_MOTOR_SPORT">Auto Motor Sport</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="automotorundsportchannel.de" site_id="AUTO_MOTOR_SPORT">Auto Motor Sport</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="AXN.hu" site_id="AXN">AXN</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="BabyTV.uk" site_id="BABYTV">Baby TV</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="BalatonTV.hu" site_id="BALATON_TV">Balaton TV</channel>
diff --git a/sites/nos.pt/nos.pt.channels.xml b/sites/nos.pt/nos.pt.channels.xml
index df497e59..5a3f46ba 100644
--- a/sites/nos.pt/nos.pt.channels.xml
+++ b/sites/nos.pt/nos.pt.channels.xml
@@ -183,7 +183,7 @@
   <channel site="nos.pt" lang="pt" xmltv_id="SportTV6.pt" site_id="610">Sport TV 6 HD</channel>
   <channel site="nos.pt" lang="pt" xmltv_id="SportTVPlus.pt" site_id="416">SPORT TV+</channel>
   <channel site="nos.pt" lang="pt" xmltv_id="StingrayiConcerts.ca" site_id="42">Stingray iConcerts HD</channel>
-  <channel site="nos.pt" lang="pt" xmltv_id="SuperRTL.de" site_id="200">Super RTL</channel>
+  <channel site="nos.pt" lang="pt" xmltv_id="RTLSuper.de" site_id="200">Super RTL</channel>
   <channel site="nos.pt" lang="pt" xmltv_id="Syfy.pt" site_id="542">SYFY</channel>
   <channel site="nos.pt" lang="pt" xmltv_id="TCVInternacional.cv" site_id="237">TCV Internacional</channel>
   <channel site="nos.pt" lang="pt" xmltv_id="TPAi.ao" site_id="138">TPA Internacional</channel>
diff --git a/sites/plex.tv/plex.tv.channels.xml b/sites/plex.tv/plex.tv.channels.xml
index 58a9f510..a19f84f6 100644
--- a/sites/plex.tv/plex.tv.channels.xml
+++ b/sites/plex.tv/plex.tv.channels.xml
@@ -116,7 +116,7 @@
   <channel site="plex.tv" lang="en" xmltv_id="HiYAH.us" site_id="5e20b730f2f8d5003d739db7-5f64c4ef35f612003f6ffe30">Hi-YAH!</channel>
   <channel site="plex.tv" lang="en" xmltv_id="HomeMadeNation.us" site_id="5e20b730f2f8d5003d739db7-5f74cf82ffbe690040689f47">Home.Made.Nation</channel>
   <channel site="plex.tv" lang="en" xmltv_id="HumorMill.us" site_id="5e20b730f2f8d5003d739db7-5fd115b7b7ef8d002dcf1814">Humor Mill</channel>
-  <channel site="plex.tv" lang="en" xmltv_id="i24NEWSUpdates.us" site_id="5e20b730f2f8d5003d739db7-61e9af453508a50f84213dd6">i24NEWS Updates</channel>
+  <channel site="plex.tv" lang="en" xmltv_id="i24NEWSUpdates.il" site_id="5e20b730f2f8d5003d739db7-61e9af453508a50f84213dd6">i24NEWS Updates</channel>
   <channel site="plex.tv" lang="en" xmltv_id="IFCFilmsPicks.us" site_id="5e20b730f2f8d5003d739db7-5fc705eb052f6f002ef46057">IFC Films Picks</channel>
   <channel site="plex.tv" lang="en" xmltv_id="IGN1.us" site_id="5e20b730f2f8d5003d739db7-5eea605474085f0040ddc77c">IGN1</channel>
   <channel site="plex.tv" lang="en" xmltv_id="IMPACTWrestling.us" site_id="5e20b730f2f8d5003d739db7-606605549dbfca002d2ae873">IMPACT Wrestling</channel>
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
index 2b87eccf..b08231f8 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
@@ -148,7 +148,7 @@
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="GaliciaTVEuropa.es" site_id="37">Galicia TV</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="GOLPLAY.es" site_id="897">Gol TV</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="Historia.es" site_id="148">Historia</channel>
-  <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="I24NewsEnglish.il" site_id="792">i24 News</channel>
+  <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="i24NEWSEnglishWorld.il" site_id="792">i24 News</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="IberaliaTV.es" site_id="654">Iberalia</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="La1.es" site_id="3">La 1</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="La2.es" site_id="4">La 2</channel>
diff --git a/sites/programetv.ro/programetv.ro.channels.xml b/sites/programetv.ro/programetv.ro.channels.xml
index 19c3c047..d29f1e6c 100644
--- a/sites/programetv.ro/programetv.ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro.channels.xml
@@ -16,7 +16,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="AntenaInternational.ro" site_id="antena-international">Antena International</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="AntenaStars.ro" site_id="antena-stars">Antena Stars</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="ArcadiaTV.li" site_id="arcadia-tv">Arcadia TV</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="AutoMotorundSport.de" site_id="auto-motor-und-sport-channel">Auto Motor und Sport</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="automotorundsportchannel.de" site_id="auto-motor-und-sport-channel">Auto Motor und Sport</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="AXNBlack.us" site_id="axn-black">AXN Black</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="AXNEurope.gr" site_id="axn">AXN</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="AXNSpin.gr" site_id="axn-spin">AXN Spin</channel>
@@ -150,7 +150,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="OrangeSport2.ro" site_id="orange-sport-2-hd">Orange Sport 2</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="OrangeSport3.ro" site_id="orange-sport-3-hd">Orange Sport 3</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="OrangeSport4.ro" site_id="orange-sport-4-hd">Orange Sport 4</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="Phoenix.de" site_id="phoenix">Phoenix</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="phoenix.de" site_id="phoenix">Phoenix</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="PlayboyTVEurope.us" site_id="playboy-tv">Playboy TV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="Prima4K.ro" site_id="prima-4k">Prima 4K</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="PrimaSport1.ro" site_id="prima-sport-1">Prima Sport 1</channel>
@@ -181,7 +181,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="RTLKetto.hu" site_id="rtl-ii-hu">RTL KETTŐ</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="RTLZwei.de" site_id="rtl-zwei">RTL Zwei</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="SAT1.de" site_id="sat-1">Sat. 1</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="Sixx.de" site_id="sixx">Sixx</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="sixx.de" site_id="sixx">Sixx</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="SorozatPlus.hu" site_id="sorozat-plusz">Sorozat +</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="SperantaTV.ro" site_id="speranta-tv">Speranta TV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="SportExtra.ro" site_id="sport-extra">Sport Extra</channel>
@@ -189,7 +189,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="StingrayDJAZZ.ca" site_id="stingray-djazz">Stingray Djazz</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="StingrayiConcerts.ca" site_id="stingray-iconcerts-hd">Stingray IConcerts HD</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="Story4.hu" site_id="story4">Story 4</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="SuperRTL.de" site_id="super-rtl">Super RTL</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="RTLSuper.de" site_id="super-rtl">Super RTL</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="TarafTV.ro" site_id="taraf-tv">Taraf TV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="TeenNick.ro" site_id="teennick">TeenNick</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="TheFishingHuntingChannel.hu" site_id="the-fishing-and-hunting-channel">The Fishing &amp; Hunting Channel</channel>
diff --git a/sites/programme-tv.net/programme-tv.net.channels.xml b/sites/programme-tv.net/programme-tv.net.channels.xml
index 352caea8..21684ff9 100644
--- a/sites/programme-tv.net/programme-tv.net.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net.channels.xml
@@ -10,7 +10,7 @@
   <channel site="programme-tv.net" lang="fr" xmltv_id="AlticeStudio.fr" site_id="altice-studio-398">Altice Studio</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="Animaux.fr" site_id="animaux-33">Animaux</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="APlus.fr" site_id="aplus-international-france-383">A+</channel>
-  <channel site="programme-tv.net" lang="fr" xmltv_id="ARTE.fr" site_id="arte-337">ARTE Français</channel>
+  <channel site="programme-tv.net" lang="fr" xmltv_id="arte.fr" site_id="arte-337">ARTE Français</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="Automotolachaine.fr" site_id="automoto-89">Automoto la chaîne</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="BabyTV.uk" site_id="baby-tv-229">Baby TV Europe</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="BBCEntertainment.uk" site_id="bbc-entertainment-194">BBC Entertainment Europe</channel>
@@ -115,7 +115,7 @@
   <channel site="programme-tv.net" lang="fr" xmltv_id="GolfPlus.fr" site_id="golfplus-189">Golf +</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="Gulli.fr" site_id="gulli-29">Gulli</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="HistoireTV.fr" site_id="histoire-tv-72">Histoire TV</channel>
-  <channel site="programme-tv.net" lang="fr" xmltv_id="I24NewsFrench.il" site_id="i24news-243">I24 News Français</channel>
+  <channel site="programme-tv.net" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="i24news-243">I24 News Français</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="InfosportPlus.fr" site_id="infosportplus-74">InfoSport +</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="JOne.fr" site_id="j-one-387">J-One</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="Ketnet.be" site_id="ketnet-255">Ketnet</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
index 42f54a71..6d15b780 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
@@ -17,14 +17,14 @@
   <channel site="programtv.onet.pl" lang="de" xmltv_id="One.de" site_id="einsfestival-363">One</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="ORF1.at" site_id="orf-1-390">ORF 1</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="ORF2.at" site_id="orf-2-393">ORF 2</channel>
-  <channel site="programtv.onet.pl" lang="de" xmltv_id="Phoenix.de" site_id="phoenix-391">Phoenix</channel>
+  <channel site="programtv.onet.pl" lang="de" xmltv_id="phoenix.de" site_id="phoenix-391">Phoenix</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="ProSieben.de" site_id="pro-7-395">ProSieben Deutschland</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="QVC.de" site_id="qvc-397">QVC Deutschland</channel>
-  <channel site="programtv.onet.pl" lang="de" xmltv_id="RBBBerlin.de" site_id="rbb-466">RBB Berlin</channel>
+  <channel site="programtv.onet.pl" lang="de" xmltv_id="rbbFernsehenBerlin.de" site_id="rbb-466">RBB Berlin</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="RTL.de" site_id="rtl-401">RTL Deutschland</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="RTLZwei.de" site_id="rtl-2-399">RTL Zwei Deutschland</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="SAT1.de" site_id="sat-1-404">Sat. 1 Deutschland</channel>
-  <channel site="programtv.onet.pl" lang="de" xmltv_id="Sixx.de" site_id="sixx-447">Sixx Deutschland</channel>
+  <channel site="programtv.onet.pl" lang="de" xmltv_id="sixx.de" site_id="sixx-447">Sixx Deutschland</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="SkyCinemaAction.de" site_id="sky-action-368">Sky Cinema Action</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="SkyCinemaBestOf.de" site_id="sky-hits-365">Sky Cinema Hits</channel>
   <channel site="programtv.onet.pl" lang="de" xmltv_id="SkyCinemaFun.de" site_id="sky-comedy-348">Sky Cinema Comedy</channel>
@@ -76,7 +76,7 @@
   <channel site="programtv.onet.pl" lang="en" xmltv_id="SkyNewsInternational.uk" site_id="sky-news-340">Sky News International</channel>
   <channel site="programtv.onet.pl" lang="en" xmltv_id="VividREDHD.us" site_id="vivid-red-hd-627">Vivid Red</channel>
   <channel site="programtv.onet.pl" lang="en" xmltv_id="VividTouch.uk" site_id="vivid-touch-636">Vivid Touch</channel>
-  <channel site="programtv.onet.pl" lang="fr" xmltv_id="ARTE.fr" site_id="arte-253">ARTE Deutsch</channel>
+  <channel site="programtv.onet.pl" lang="fr" xmltv_id="arte.fr" site_id="arte-253">ARTE Deutsch</channel>
   <channel site="programtv.onet.pl" lang="fr" xmltv_id="France2.fr" site_id="france-2-pl-329">France 2</channel>
   <channel site="programtv.onet.pl" lang="fr" xmltv_id="France24French.fr" site_id="france-24-491">France 24 Français</channel>
   <channel site="programtv.onet.pl" lang="nl" xmltv_id="NPO1.nl" site_id="npo-1-385">NPO 1</channel>
@@ -187,7 +187,7 @@
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="History2.pl" site_id="h2-203">History 2 Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="History.pl" site_id="history-91">History Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="HomeTV.pl" site_id="tvr-132">Home TV</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="HRFernsehen.de" site_id="hr-374">HR Fernsehen</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="hrfernsehen.de" site_id="hr-374">HR Fernsehen</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="InvestigationDiscovery.pl" site_id="id-117">Investigation Discovery Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Junior.de" site_id="junior-niem-375">Junior</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="kabeleins.de" site_id="kabel-eins-376">Kabel Eins Deutschland</channel>
@@ -286,10 +286,10 @@
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="StopklatkaTV.pl" site_id="stopklatka-tv-185">Stopklatka TV</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="SundanceTV.pl" site_id="sundance-channel-237">Sundance TV Europe</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="SuperPolsat.pl" site_id="super-polsat-541">Super Polsat</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="SuperRTL.de" site_id="super-rtl-400">Super RTL Deutschland</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="RTLSuper.de" site_id="super-rtl-400">Super RTL Deutschland</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Superstacja.pl" site_id="superstacja-69">Superstacja</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="TBNPolska.pl" site_id="tbn-polska-598">TBN Polska</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="Tele5.de" site_id="tele-5-niem-448">Tele 5</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="TELE5.de" site_id="tele-5-niem-448">Tele 5</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Tele5.pl" site_id="tele-5-352">Tele 5</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="TeletoonPlus.fr" site_id="teletoon-232">Teletoon + HD Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="TF1.fr" site_id="tf-1-463">TF 1</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be.channels.xml b/sites/proximusmwc.be/proximusmwc.be.channels.xml
index 24d648fe..9b054d3a 100644
--- a/sites/proximusmwc.be/proximusmwc.be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be.channels.xml
@@ -27,7 +27,7 @@
   <channel site="proximusmwc.be" lang="fr" xmltv_id="AlAoulaEurope.ma" site_id="UID50141">Al Aoula</channel>
   <channel site="proximusmwc.be" lang="fr" xmltv_id="AlJazeeraEnglish.qa" site_id="UID50162">Al Jazeera</channel>
   <channel site="proximusmwc.be" lang="fr" xmltv_id="Animaux.fr" site_id="UID50053">Animaux</channel>
-  <channel site="proximusmwc.be" lang="fr" xmltv_id="ARTE.fr" site_id="UID50018">Arte</channel>
+  <channel site="proximusmwc.be" lang="fr" xmltv_id="arte.fr" site_id="UID50018">Arte</channel>
   <channel site="proximusmwc.be" lang="fr" xmltv_id="Automotolachaine.fr" site_id="UID50111">AUTOMOTO</channel>
   <channel site="proximusmwc.be" lang="fr" xmltv_id="Be1.be" site_id="UID0300">Be1</channel>
   <channel site="proximusmwc.be" lang="fr" xmltv_id="BeCine.be" site_id="UID0301">Be Ciné</channel>
diff --git a/sites/startimestv.com/startimestv.com.channels.xml b/sites/startimestv.com/startimestv.com.channels.xml
index 0047a82d..6f6145cc 100644
--- a/sites/startimestv.com/startimestv.com.channels.xml
+++ b/sites/startimestv.com/startimestv.com.channels.xml
@@ -314,7 +314,7 @@
   <channel site="startimestv.com" lang="en" xmltv_id="TVM.mz" site_id="532">TVM1</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVM2.mz" site_id="533">TVM2</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVMalagasy.mg" site_id="2147205607">TVM</channel>
-  <channel site="startimestv.com" lang="en" xmltv_id="TVManaMaputo.mz" site_id="527">TV MANA</channel>
+  <channel site="startimestv.com" lang="en" xmltv_id="TVManaMocambique.mz" site_id="527">TV MANA</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVMiramar.mz" site_id="517">MIRAMAR</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVMTelescola.mz" site_id="518">TELESCOLA</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVPlusMadagascar.mg" site_id="1849908339">TVPLUS</channel>
diff --git a/sites/superguidatv.it/superguidatv.it.channels.xml b/sites/superguidatv.it/superguidatv.it.channels.xml
index f9ee5986..2c0c3bd3 100644
--- a/sites/superguidatv.it/superguidatv.it.channels.xml
+++ b/sites/superguidatv.it/superguidatv.it.channels.xml
@@ -17,7 +17,7 @@
   <!-- <channel site="superguidatv.it" lang="it" xmltv_id="" site_id="sky-sport-261/sky-sport/62">Sky Sport 261</channel> -->
   <channel site="superguidatv.it" lang="en" xmltv_id="FoxNewsChannel.us" site_id="fox-news/sky-news/119">Fox News</channel>
   <channel site="superguidatv.it" lang="en" xmltv_id="France24English.fr" site_id="france-24-english-/sky-news/124">France 24 English</channel>
-  <channel site="superguidatv.it" lang="en" xmltv_id="I24NewsEnglish.il" site_id="i24news/sky-news/126">I24news</channel>
+  <channel site="superguidatv.it" lang="en" xmltv_id="i24NEWSEnglishWorld.il" site_id="i24news/sky-news/126">I24news</channel>
   <channel site="superguidatv.it" lang="fr" xmltv_id="France24French.fr" site_id="france-24/sky-news/252">France 24</channel>
   <channel site="superguidatv.it" lang="it" xmltv_id="20.it" site_id="20/443">20</channel>
   <channel site="superguidatv.it" lang="it" xmltv_id="Twentyseven.it" site_id="twenty-seven/601">Twenty Seven</channel>
diff --git a/sites/telecablesat.fr/telecablesat.fr.channels.xml b/sites/telecablesat.fr/telecablesat.fr.channels.xml
index 11eb4684..f8339253 100644
--- a/sites/telecablesat.fr/telecablesat.fr.channels.xml
+++ b/sites/telecablesat.fr/telecablesat.fr.channels.xml
@@ -23,7 +23,7 @@
   <channel site="telecablesat.fr" lang="fr" xmltv_id="Animaux.fr" site_id="12">Animaux</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="AntenneReunion.fr" site_id="436">Antenne Réunion</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="APlusInternational.fr" site_id="2049">A+ International France</channel>
-  <channel site="telecablesat.fr" lang="fr" xmltv_id="ARTE.fr" site_id="111">Arte</channel>
+  <channel site="telecablesat.fr" lang="fr" xmltv_id="arte.fr" site_id="111">Arte</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="Automotolachaine.fr" site_id="15">Automoto</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="Be1.be" site_id="29">BE 1</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="BeCine.be" site_id="417">Be Ciné</channel>
@@ -134,7 +134,7 @@
   <channel site="telecablesat.fr" lang="fr" xmltv_id="Guyane1ere.gf" site_id="260">Guyane la 1ère</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="HistoireTV.fr" site_id="88">Histoire TV</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="HustlerTVEurope.nl" site_id="416">Hustler TV</channel>
-  <channel site="telecablesat.fr" lang="fr" xmltv_id="I24NewsFrench.il" site_id="781">I24news</channel>
+  <channel site="telecablesat.fr" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="781">I24news</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="InfosportPlus.fr" site_id="94">Infosport+</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="InvestigationDiscovery.fr" site_id="2184">Discovery Investigation</channel>
   <channel site="telecablesat.fr" lang="fr" xmltv_id="JOne.fr" site_id="1585">J-One</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_en.channels.xml b/sites/teliatv.ee/teliatv.ee_en.channels.xml
index 40f568c7..68d403ef 100644
--- a/sites/teliatv.ee/teliatv.ee_en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_en.channels.xml
@@ -3,7 +3,7 @@
   <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1224">Food Network</channel> -->
   <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#243">Fireplace</channel> -->
   <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#829">AMC</channel> -->
-  <channel site="teliatv.ee" lang="de" xmltv_id="ARTE.fr" site_id="en#24">Arte</channel>
+  <channel site="teliatv.ee" lang="de" xmltv_id="arte.fr" site_id="en#24">Arte</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="ntv.de" site_id="en#145">n-tv</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="RTL.de" site_id="en#20">RTL</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="RTLZwei.de" site_id="en#1229">RTL2</channel>
@@ -72,7 +72,7 @@
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayClassica.ca" site_id="en#790">Classica</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="en#1129">DJAZZ.tv</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayiConcerts.ca" site_id="en#731">iConcerts</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="SuperRTL.de" site_id="en#17">Super RTL</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="RTLSuper.de" site_id="en#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TLC.ru" site_id="en#823">TLC</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TravelChannelEMEA.uk" site_id="en#1222">Travel Channel</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000action.ru" site_id="en#227">TV1000 Action</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_et.channels.xml b/sites/teliatv.ee/teliatv.ee_et.channels.xml
index 9ec99aef..d81070b7 100644
--- a/sites/teliatv.ee/teliatv.ee_et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_et.channels.xml
@@ -5,7 +5,7 @@
   <!-- <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#243">Kamin</channel> -->
   <channel site="teliatv.ee" lang="et" xmltv_id="AloTV.ee" site_id="et#157">ALO-TV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="AnimalPlanet.ru" site_id="et#31">Animal Planet</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="ARTE.fr" site_id="et#24">Arte</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="arte.fr" site_id="et#24">Arte</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="BloombergTVEurope.uk" site_id="et#81">Bloomberg TV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="BoomerangCEE.us" site_id="et#57">Boomerang</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="CNBCEurope.uk" site_id="et#82">CNBC Europe</channel>
@@ -50,7 +50,7 @@
   <channel site="teliatv.ee" lang="et" xmltv_id="SAT1.de" site_id="et#11">SAT 1</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="SetantaSports1Evraziya.ie" site_id="et#1206">Setanta Sports</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Smartzone.ee" site_id="et#1344">Smartzone</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="SuperRTL.de" site_id="et#17">Super RTL</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="RTLSuper.de" site_id="et#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TaevasTV7.fi" site_id="et#248">TAEVAS TV7</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TLC.ru" site_id="et#823">TLC</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TravelChannelEMEA.uk" site_id="et#1222">Travel Channel</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
index e059a64f..34f9ba0e 100644
--- a/sites/teliatv.ee/teliatv.ee_ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
@@ -5,7 +5,7 @@
   <!-- <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#829">AMC</channel> -->
   <channel site="teliatv.ee" lang="ru" xmltv_id="Eurosport2.ru" site_id="ru#51">Eurosport 2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="AnimalPlanet.ru" site_id="ru#31">Animal Planet</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="ARTE.fr" site_id="ru#24">Arte</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="arte.fr" site_id="ru#24">Arte</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="BoomerangCEE.us" site_id="ru#57">Boomerang</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="CartoonNetwork.ru" site_id="ru#55">Cartoon Network</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="CNNInternationalEurope.us" site_id="ru#50">CNN International</channel>
@@ -59,7 +59,7 @@
   <channel site="teliatv.ee" lang="ru" xmltv_id="SAT1.de" site_id="ru#11">SAT 1</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="SetantaSports1Evraziya.ie" site_id="ru#1206">Setanta Sports</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Smartzone.ee" site_id="ru#1344">Smartzone</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="SuperRTL.de" site_id="ru#17">Super RTL</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="RTLSuper.de" site_id="ru#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TBNBaltia.ee" site_id="ru#261">TBN Baltia</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TLC.ru" site_id="ru#823">TLC</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TravelChannelEMEA.uk" site_id="ru#1222">Travel Channel</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch.channels.xml
index efe0e7b4..eb58cdac 100644
--- a/sites/tv.blue.ch/tv.blue.ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch.channels.xml
@@ -205,10 +205,10 @@
   <channel site="tv.blue.ch" lang="de" xmltv_id="AnixeHDSerie.de" site_id="24">Anixe Serie</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ArcadiaTV.li" site_id="1950">ARCADIA world TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ARDalpha.de" site_id="26">ARD Alpha</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="ARTE.de" site_id="27">ARTE Deutsch</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="arte.de" site_id="27">ARTE Deutsch</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="AuftankenTV.ch" site_id="1216">Auftanken TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="AutoMotorogSportTV.no" site_id="1616">Auto Motor und Sport</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="AutoMotorundSport.de" site_id="1783">Auto Motor und Sport</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="automotorundsportchannel.de" site_id="1783">Auto Motor und Sport</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Bergblick.de" site_id="1409">Bergblick</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="BibelTV.de" site_id="44">Bibel TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Bild.de" site_id="1865">Bild</channel>
@@ -256,10 +256,10 @@
   <channel site="tv.blue.ch" lang="de" xmltv_id="History.de" site_id="203">History Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="HitExpressTV.ch" site_id="1825">HitExpress TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="HopeChannelGerman.de" site_id="204">Hope TV Deutsch</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="HRFernsehen.de" site_id="205">HR Fernsehen</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="hrfernsehen.de" site_id="205">HR Fernsehen</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="HSE.de" site_id="207">HSE</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Junior.de" site_id="224">Junior</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="kabeleinsclassics.de" site_id="1389">Kabel Eins Classics</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="kabeleinsClassics.de" site_id="1389">Kabel Eins Classics</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="kabeleinsDoku.de" site_id="920">Kabel Eins Doku Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="kabeleinsSchweiz.ch" site_id="226">Kabel Eins Schweiz</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Kanal9.ch" site_id="227">Kanal 9</channel>
@@ -297,7 +297,7 @@
   <channel site="tv.blue.ch" lang="de" xmltv_id="ORF2.at" site_id="302">ORF 2</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ORFIII.at" site_id="1222">ORF III</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ORFSportPlus.at" site_id="1889">ORF Sport +</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="Phoenix.de" site_id="307">Phoenix TV!</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="phoenix.de" site_id="307">Phoenix TV!</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="PremiumShoppingTV.ch" site_id="1724">Premium Shopping TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ProSiebenFun.de" site_id="1607">ProSieben Fun</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ProSiebenMaxx.de" site_id="323">ProSieben Maxx Deutschland</channel>
@@ -305,7 +305,7 @@
   <channel site="tv.blue.ch" lang="de" xmltv_id="PulsAcht.ch" site_id="325">Puls Acht</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="R9.at" site_id="326">R9</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="RadioPilatusTV.ch" site_id="308">Radio Pilatus TV</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="RBBBerlin.de" site_id="342">RBB Berlin</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="rbbFernsehenBerlin.de" site_id="342">RBB Berlin</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="RegioTVplus.ch" site_id="904">regioTVplus</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="RheinweltenTV.ch" site_id="1466">Rheinwelten TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="RiC.de" site_id="350">RiC</channel>
@@ -319,32 +319,32 @@
   <channel site="tv.blue.ch" lang="de" xmltv_id="RTLZwei.de" site_id="359">RTL Zwei</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="S1.ch" site_id="374">S1</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SAT1.de" site_id="375">Sat. 1 Deutschland</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="SAT1GOLD.de" site_id="377">Sat. 1 Gold Deutschland</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="SAT1Gold.de" site_id="377">Sat. 1 Gold Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SchaffhauserFernsehen.ch" site_id="382">Schaffhauser Fernsehen</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SchlagerDeluxe.de" site_id="1714">Schlager Deluxe</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="ServusTV.at" site_id="381">Servus TV Deutschland</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="Sixx.de" site_id="385">Sixx Deutschland</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="sixx.de" site_id="385">Sixx Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="AXNBlack.de" site_id="32">Sony AXN</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SonyChannel.de" site_id="1083">Sony Channel Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SpiegelGeschichte.de" site_id="395">Spiegel Geschichte</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Sport1.de" site_id="398">Sport1</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Sport1Plus.de" site_id="1552">Sport 1+</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="Sportdigital.de" site_id="1554">Sportdigital Fussball</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="SportdigitalFUSSBALL.de" site_id="1554">Sportdigital Fussball</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SRF1.ch" site_id="399">SRF 1</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SRFernsehen.de" site_id="1502">SR Fernsehen</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="SRFInfo.ch" site_id="400">SRF Info</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="SRFinfo.ch" site_id="400">SRF Info</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SRFzwei.ch" site_id="401">SRF Zwei</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="StarTV.ch" site_id="405">Star TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="StingrayClassica.ca" site_id="102">Stingray Classica</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Sudostschweiz.ch" site_id="621">Südostschweiz</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="SuperRTL.de" site_id="411">Super RTL Deutschland</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="RTLSuper.de" site_id="411">Super RTL Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Swiss1.ch" site_id="1223">Swiss 1</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SwissSportTV.ch" site_id="1601">Swiss Sport TV</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SWRFernsehenBadenWurttemberg.de" site_id="414">SWR Fernsehen Baden-Württemberg</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="SYFY.de" site_id="415">Syfy Deutschland</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="tagesschau24.de" site_id="417">Tagesschau 24</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Tele1.ch" site_id="570">Tele 1</channel>
-  <channel site="tv.blue.ch" lang="de" xmltv_id="Tele5.de" site_id="571">Tele 5</channel>
+  <channel site="tv.blue.ch" lang="de" xmltv_id="TELE5.de" site_id="571">Tele 5</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="TeleBarn.ch" site_id="572">TeleBärn</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="Telebasel.ch" site_id="586">Telebasel</channel>
   <channel site="tv.blue.ch" lang="de" xmltv_id="TeleBielingue.ch" site_id="573">TeleBielingue</channel>
@@ -432,7 +432,7 @@
   <channel site="tv.blue.ch" lang="en" xmltv_id="GREATmovies.uk" site_id="1809">Great! Movies</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="GREATaction.uk" site_id="1810">Great! Movies Action</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="GREATromance.uk" site_id="1805">Great! Movies Classic</channel>
-  <channel site="tv.blue.ch" lang="en" xmltv_id="I24NewsEnglish.il" site_id="208">I24 News English</channel>
+  <channel site="tv.blue.ch" lang="en" xmltv_id="i24NEWSEnglishWorld.il" site_id="208">I24 News English</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="InsightTV.nl" site_id="1029">Insight HD</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="InsightTVUHD.nl" site_id="667">Insight UHD</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="ITV1.uk" site_id="218">ITV 1</channel>
@@ -489,7 +489,7 @@
   <channel site="tv.blue.ch" lang="fr" xmltv_id="AjoieTV.ch" site_id="1456">Ajoie TV</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="Alsace20.fr" site_id="1695">Alsace 20</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="Animaux.fr" site_id="22">Animaux</channel>
-  <channel site="tv.blue.ch" lang="fr" xmltv_id="ARTE.fr" site_id="28">ARTE Français</channel>
+  <channel site="tv.blue.ch" lang="fr" xmltv_id="arte.fr" site_id="28">ARTE Français</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="Automotolachaine.fr" site_id="10">Automoto la chaîne</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="BET.fr" site_id="1730">BET France</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="BFMBusiness.fr" site_id="42">BFM Business</channel>
@@ -551,7 +551,7 @@
   <channel site="tv.blue.ch" lang="fr" xmltv_id="GrandGeneveTV.fr" site_id="1328">Grand Genève TV</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="Gulli.fr" site_id="195">Gulli</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="HistoireTV.fr" site_id="202">Histoire TV</channel>
-  <channel site="tv.blue.ch" lang="fr" xmltv_id="I24NewsFrench.il" site_id="209">I24 News Français</channel>
+  <channel site="tv.blue.ch" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="209">I24 News Français</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="InfosportPlus.fr" site_id="213">InfoSport+</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="JOne.fr" site_id="1765">J-One</channel>
   <channel site="tv.blue.ch" lang="fr" xmltv_id="KTO.fr" site_id="232">KTO</channel>
diff --git a/sites/tv.nu/tv.nu.channels.xml b/sites/tv.nu/tv.nu.channels.xml
index f7e83340..62e295fd 100644
--- a/sites/tv.nu/tv.nu.channels.xml
+++ b/sites/tv.nu/tv.nu.channels.xml
@@ -4,7 +4,7 @@
   <channel site="tv.nu" lang="sv" xmltv_id="AdultChannel.uk" site_id="adult-channel">Adult Channel (UK)</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera-english">Al Jazeera English</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="AnimalPlanetNordic.uk" site_id="animal-planet">Animal Planet</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="ARTE.fr" site_id="arte">ARTE</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="arte.fr" site_id="arte">ARTE</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="ATGLive.se" site_id="atg-live">ATG Live</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="AxessTV.se" site_id="axess-tv">Axess TV</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="BBCBrit.se" site_id="bbc-brit">BBC Brit</channel>
@@ -122,7 +122,7 @@
   <channel site="tv.nu" lang="sv" xmltv_id="Sportkanalen.se" site_id="sportkanalen">Sportkanalen</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="StingrayClassica.ca" site_id="stingray-classic">Stingray Classica</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="StingrayDJAZZ.ca" site_id="djazz-hd">Djazz HD</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="SuperRTL.de" site_id="super-rtl">Super RTL</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="RTLSuper.de" site_id="super-rtl">Super RTL</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="SVT1.se" site_id="svt1">SVT1</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="SVT2.se" site_id="svt2">SVT2</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="SVT24.se" site_id="svt24">SVT24</channel>
diff --git a/sites/tv.post.lu/tv.post.lu.channels.xml b/sites/tv.post.lu/tv.post.lu.channels.xml
index 036c2ba4..eb56c81c 100644
--- a/sites/tv.post.lu/tv.post.lu.channels.xml
+++ b/sites/tv.post.lu/tv.post.lu.channels.xml
@@ -87,7 +87,7 @@
   <channel site="tv.post.lu" lang="de" xmltv_id="3sat.de" site_id="a81bafe0-8095-11e9-b5ca-f345a2ed0fbe">3sat</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="AnimalPlanet.de" site_id="fcaabf30-77e7-11e9-b5ca-f345a2ed0fbe">Animal Planet</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="ARDalpha.de" site_id="067f0c30-8096-11e9-b5ca-f345a2ed0fbe">ARD-Alpha</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="AutoMotorundSport.de" site_id="da694da0-7199-11e9-a762-3be38d7f533c">Auto Motor Sport</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="automotorundsportchannel.de" site_id="da694da0-7199-11e9-a762-3be38d7f533c">Auto Motor Sport</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="Bergblick.de" site_id="eae06590-1ec4-11eb-953f-eb0eedf1f375">Bergblick TV</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="BibelTV.de" site_id="39dd1270-8096-11e9-b5ca-f345a2ed0fbe">Bibel TV</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="Boomerang.de" site_id="53424560-81d5-11e9-b43b-9d7b168e6372">Boomerang</channel>
@@ -105,7 +105,7 @@
   <channel site="tv.post.lu" lang="de" xmltv_id="GuteLauneTV.de" site_id="46b509d0-719b-11e9-a762-3be38d7f533c">Gute Laune TV</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="Heimatkanal.de" site_id="45bf2510-81d6-11e9-b43b-9d7b168e6372">HeimatKanal</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="History.de" site_id="9f487b30-81d7-11e9-b43b-9d7b168e6372">History</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="HRFernsehen.de" site_id="dee87710-8095-11e9-b5ca-f345a2ed0fbe">HR Fernsehen</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="hrfernsehen.de" site_id="dee87710-8095-11e9-b5ca-f345a2ed0fbe">HR Fernsehen</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="Jukebox.de" site_id="33244430-81d6-11e9-b43b-9d7b168e6372">Jukebox</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="kabeleins.de" site_id="b211f560-8093-11e9-b5ca-f345a2ed0fbe">Kabel eins</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="kabeleinsDoku.de" site_id="39cc8290-8094-11e9-b5ca-f345a2ed0fbe">Kabel eins Doku</channel>
@@ -125,7 +125,7 @@
   <channel site="tv.post.lu" lang="de" xmltv_id="ntv.de" site_id="2f118d80-8096-11e9-b5ca-f345a2ed0fbe">n-tv</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="One.de" site_id="a041a590-8095-11e9-b5ca-f345a2ed0fbe">One</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="OUTtv.nl" site_id="bf597c90-8d25-11e9-ac99-079f5aa46735">OutTV</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="Phoenix.de" site_id="1dfa3f60-8096-11e9-b5ca-f345a2ed0fbe">Phoenix</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="phoenix.de" site_id="1dfa3f60-8096-11e9-b5ca-f345a2ed0fbe">Phoenix</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="ProSieben.de" site_id="919c7ad0-8093-11e9-b5ca-f345a2ed0fbe">ProSieben</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="RomanceTV.de" site_id="29334c70-719e-11e9-a762-3be38d7f533c">Romance TV</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="RTLCrime.de" site_id="a8210140-836d-11e9-a0f7-b16899773165">RTL Crime</channel>
@@ -135,9 +135,9 @@
   <channel site="tv.post.lu" lang="de" xmltv_id="RTLup.de" site_id="1d77dae0-8094-11e9-b5ca-f345a2ed0fbe">RTLup</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="RTLZwei.de" site_id="a568d6d0-8093-11e9-b5ca-f345a2ed0fbe">RTLZWEI</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SAT1.de" site_id="87c0d420-8093-11e9-b5ca-f345a2ed0fbe">SAT.1</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="SAT1GOLD.de" site_id="0511d280-8094-11e9-b5ca-f345a2ed0fbe">SAT.1 Gold</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="SAT1Gold.de" site_id="0511d280-8094-11e9-b5ca-f345a2ed0fbe">SAT.1 Gold</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="ServusTVDeutschland.de" site_id="a4cb41d0-8094-11e9-b5ca-f345a2ed0fbe">Servus TV</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="Sixx.de" site_id="f17a6930-8093-11e9-b5ca-f345a2ed0fbe">SIXX</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="sixx.de" site_id="f17a6930-8093-11e9-b5ca-f345a2ed0fbe">SIXX</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SkyAtlantic.de" site_id="93ae7820-81d6-11e9-b43b-9d7b168e6372">Sky Atlantic HD</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SkyCinemaAction.de" site_id="a665a050-81e6-11e9-b43b-9d7b168e6372">Sky Cinema Action HD</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SkyCinemaBestOf.de" site_id="99cfe2b0-81e6-11e9-b43b-9d7b168e6372">Sky Cinema Best of HD</channel>
@@ -182,11 +182,11 @@
   <channel site="tv.post.lu" lang="de" xmltv_id="AXNBlack.de" site_id="5524fb20-719a-11e9-a762-3be38d7f533c">Sony AXN</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SpiegelGeschichte.de" site_id="9d702e30-81d6-11e9-b43b-9d7b168e6372">Spiegel Geschichte</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="Sport1.de" site_id="ad6519b0-8094-11e9-b5ca-f345a2ed0fbe">Sport1</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="Sportdigital.de" site_id="a3633f40-719f-11e9-a762-3be38d7f533c">SPORTDIGITAL FUSSBALL</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="SportdigitalFUSSBALL.de" site_id="a3633f40-719f-11e9-a762-3be38d7f533c">SPORTDIGITAL FUSSBALL</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SRFernsehen.de" site_id="fd1cb430-8095-11e9-b5ca-f345a2ed0fbe">SR Fernsehen</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="SuperRTL.de" site_id="c8f8b0c0-8093-11e9-b5ca-f345a2ed0fbe">SUPER RTL</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="RTLSuper.de" site_id="c8f8b0c0-8093-11e9-b5ca-f345a2ed0fbe">SUPER RTL</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="SYFY.de" site_id="83a12a80-81d7-11e9-b43b-9d7b168e6372">Syfy</channel>
-  <channel site="tv.post.lu" lang="de" xmltv_id="Tele5.de" site_id="4ae53040-8094-11e9-b5ca-f345a2ed0fbe">Tele5</channel>
+  <channel site="tv.post.lu" lang="de" xmltv_id="TELE5.de" site_id="4ae53040-8094-11e9-b5ca-f345a2ed0fbe">Tele5</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="TLC.de" site_id="84d4c1f0-77e6-11e9-b5ca-f345a2ed0fbe">TLC</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="TOGGOplus.de" site_id="e64ca000-8093-11e9-b5ca-f345a2ed0fbe">TOGGO Plus</channel>
   <channel site="tv.post.lu" lang="de" xmltv_id="UniversalTV.de" site_id="95bf3a40-81d7-11e9-b43b-9d7b168e6372">Universal TV</channel>
@@ -239,7 +239,7 @@
   <channel site="tv.post.lu" lang="fr" xmltv_id="ABXplore.be" site_id="3c77f930-77f1-11e9-b5ca-f345a2ed0fbe">ABXPLORE</channel>
   <channel site="tv.post.lu" lang="fr" xmltv_id="Action.fr" site_id="4b952500-77f1-11e9-b5ca-f345a2ed0fbe">Action</channel>
   <channel site="tv.post.lu" lang="fr" xmltv_id="Animaux.fr" site_id="65275150-77f1-11e9-b5ca-f345a2ed0fbe">Animaux</channel>
-  <channel site="tv.post.lu" lang="fr" xmltv_id="ARTE.fr" site_id="cb6aec70-8097-11e9-b5ca-f345a2ed0fbe">ARTE (FR)</channel>
+  <channel site="tv.post.lu" lang="fr" xmltv_id="arte.fr" site_id="cb6aec70-8097-11e9-b5ca-f345a2ed0fbe">ARTE (FR)</channel>
   <channel site="tv.post.lu" lang="fr" xmltv_id="Automotolachaine.fr" site_id="70645cc0-77f1-11e9-b5ca-f345a2ed0fbe">Automoto</channel>
   <channel site="tv.post.lu" lang="fr" xmltv_id="Be1.be" site_id="8f035260-8d15-11e9-b2ae-334cebea47fb">Be 1</channel>
   <channel site="tv.post.lu" lang="fr" xmltv_id="BeCine.be" site_id="f6185450-8d15-11e9-b2ae-334cebea47fb">Be Ciné</channel>
diff --git a/sites/tv24.se/tv24.se.channels.xml b/sites/tv24.se/tv24.se.channels.xml
index 8fdd9564..93162fc3 100644
--- a/sites/tv24.se/tv24.se.channels.xml
+++ b/sites/tv24.se/tv24.se.channels.xml
@@ -245,7 +245,7 @@
   <channel site="tv24.se" lang="sv" xmltv_id="SkyShowtime2.se" site_id="skyshowtime-2">Sky Showtime 2</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="Sportkanalen.se" site_id="sportkanalen">Sportkanalen</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="StingrayDJAZZ.ca" site_id="djazz-hd">Djazz HD</channel>
-  <channel site="tv24.se" lang="sv" xmltv_id="SuperRTL.de" site_id="super-rtl">Super RTL</channel>
+  <channel site="tv24.se" lang="sv" xmltv_id="RTLSuper.de" site_id="super-rtl">Super RTL</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="SVT1.se" site_id="svt1">SVT1</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="SVT2.se" site_id="svt2">SVT2</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="SVT24.se" site_id="svt24">SVT24</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 54ca4b58..0676befb 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -16,7 +16,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ArenaSport2.rs" site_id="1000689">Arena Sport 2</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ArenaSport3.rs" site_id="1000787">Arena Sport 3</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ArenaSport4.rs" site_id="1000788">Arena Sport 4</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ARTE.fr" site_id="1000026">ARTE Français</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="arte.fr" site_id="1000026">ARTE Français</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ATMTV.si" site_id="1000001">ATM TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="B92.rs" site_id="1000207">B92</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BabyTV.uk" site_id="82">Baby TV</channel>
@@ -214,7 +214,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="StingrayFestival4K.ca" site_id="1000527">Stingray Festival 4K</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="STVSkledar.si" site_id="1000052">S-TV Skledar</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="SuperONEHD.hu" site_id="1000342">SuperOne HD</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="SuperRTL.de" site_id="73">Super RTL</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="RTLSuper.de" site_id="73">Super RTL</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="T2Info.si" site_id="1000543">T-2 Info</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Telecafe.ru" site_id="1000456">Telecafé</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TelmaTV.mk" site_id="1000226">Telma</channel>
diff --git a/sites/tvgids.nl/tvgids.nl.channels.xml b/sites/tvgids.nl/tvgids.nl.channels.xml
index 8276fa78..1e86788d 100644
--- a/sites/tvgids.nl/tvgids.nl.channels.xml
+++ b/sites/tvgids.nl/tvgids.nl.channels.xml
@@ -15,7 +15,7 @@
   <channel site="tvgids.nl" lang="nl" xmltv_id="3sat.de" site_id="3sat">3Sat</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="AlJazeeraEnglish.qa" site_id="aljazeera">Al Jazeera Engels</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="AnimalPlanet.nl" site_id="animalplanet">Animal Planet</channel>
-  <channel site="tvgids.nl" lang="nl" xmltv_id="ARTE.fr" site_id="arte">ARTE</channel>
+  <channel site="tvgids.nl" lang="nl" xmltv_id="arte.fr" site_id="arte">ARTE</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="AT5.nl" site_id="at5">AT5</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="BBCEntertainment.uk" site_id="bbce">BBC Entertainment</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="BBCFirstBenelux.uk" site_id="bbcfirst">BBC First</channel>
diff --git a/sites/tvheute.at/tvheute.at.channels.xml b/sites/tvheute.at/tvheute.at.channels.xml
index 152b9ae5..be64725e 100644
--- a/sites/tvheute.at/tvheute.at.channels.xml
+++ b/sites/tvheute.at/tvheute.at.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
   <channel site="tvheute.at" lang="de" xmltv_id="3sat.de" site_id="3sat">3sat</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="ARTE.fr" site_id="arte">ARTE Deutsch</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="arte.fr" site_id="arte">ARTE Deutsch</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ATV.at" site_id="atv">ATV</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ATV2.at" site_id="atv2">ATV 2</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="BRFernsehenSud.de" site_id="br">Bayerisches Fernsehen Süd</channel>
@@ -10,42 +10,42 @@
   <channel site="tvheute.at" lang="de" xmltv_id="DisneyChannel.de" site_id="disney">Disney Channel Deutschland</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="DMAX.de" site_id="dmax">DMAX Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="Eurosport1.de" site_id="euro">Eurosport 1 Germany</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="HRFernsehen.de" site_id="hr">HR Fernsehen</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="hrfernsehen.de" site_id="hr">HR Fernsehen</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="kabeleinsAustria.at" site_id="k1">Kabel Eins Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="KiKA.de" site_id="kika">KIKA</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="MDRFernsehenSachsenAnhalt.de" site_id="mdr">MDR Fernsehen Sachsen-Anhalt</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="NDRFernsehenNiedersachsen.de" site_id="ndr">NDR Fernsehen Niedersachsen</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="NickAustria.at" site_id="nick">Nickelodeon Austria</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="NickelodeonAustria.at" site_id="nick">Nickelodeon Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="Nitro.de" site_id="nitro">Nitro Austria</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="NTV.at" site_id="ntv">N-TV Austria</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="Oe24TV.at" site_id="oe24tv">Oe24 TV</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="ntv.at" site_id="ntv">N-TV Austria</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="oe24TV.at" site_id="oe24tv">Oe24 TV</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="One.de" site_id="one">One</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ORF1.at" site_id="orf1">ORF 1</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ORF2.at" site_id="orf2">ORF 2</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ORFIII.at" site_id="orf_iii">ORF III</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ORFSportPlus.at" site_id="orf_+">ORF Sport +</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="Phoenix.de" site_id="phoenix">Phoenix</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="phoenix.de" site_id="phoenix">Phoenix</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ProSiebenAustria.at" site_id="pro7">ProSieben Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ProSiebenMaxxAustria.at" site_id="7maxx">ProSieben Maxx Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="Puls4.at" site_id="puls_4">Puls 4</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="RBBBerlin.de" site_id="rbb">RBB Berlin</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="rbbFernsehenBerlin.de" site_id="rbb">RBB Berlin</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="RTLCrime.de" site_id="rtlcrime">RTL Crime Deutschland</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="RTL.de" site_id="rtl">RTL Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="RTLLiving.de" site_id="rtlliving">RTL Living Deutschland</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="RTLZwei.de" site_id="rtl2">RTL Zwei Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SAT1Austria.at" site_id="sat1">Sat. 1 Österreich</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="SAT1GOLDAustria.at" site_id="sat1gold">Sat. 1 Gold Österreich</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="SAT1GoldAustria.at" site_id="sat1gold">Sat. 1 Gold Österreich</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="ServusTV.at" site_id="servustv">Servus TV Österreich</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="SixxAustria.at" site_id="sixx">Sixx Austria</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="sixxAustria.at" site_id="sixx">Sixx Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SkyCinemaPremieren.de" site_id="skyci">Sky Cinema Premieren</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SkySport1.de" site_id="skysp1">Sky Sport 1</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SkySport2.de" site_id="skysp2">Sky Sport 2</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SkySportAustria1.at" site_id="skyaut">Sky Sport Austria 1</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SkySportBundesliga1.de" site_id="skybl">Sky Sport Bundesliga 1</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="Sport1.de" site_id="sport1">Sport 1</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="SuperRTL.de" site_id="rtls">Super RTL Austria</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="RTLSuper.de" site_id="rtls">Super RTL Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="SWRFernsehenBadenWurttemberg.de" site_id="swr">SWR Fernsehen Baden-Württemberg</channel>
-  <channel site="tvheute.at" lang="de" xmltv_id="Tele5.de" site_id="tele_5">Tele 5</channel>
+  <channel site="tvheute.at" lang="de" xmltv_id="TELE5.de" site_id="tele_5">Tele 5</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="VOX.at" site_id="vox">Vox Austria</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="WDRFernsehenKoln.de" site_id="wdr">WDR Fernsehen Köln</channel>
   <channel site="tvheute.at" lang="de" xmltv_id="WELT.de" site_id="welt">Welt</channel>
diff --git a/sites/tvprofil.com/tvprofil.com.channels.xml b/sites/tvprofil.com/tvprofil.com.channels.xml
index 599b481b..9f8b78c3 100644
--- a/sites/tvprofil.com/tvprofil.com.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com.channels.xml
@@ -123,7 +123,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="ArenaSport8.hr" site_id="rs/tvprogram#arena-sport-8-hr">Arena Sport 8 Croatia</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ArenaSport8.rs" site_id="rs/tvprogram#arena-sport-8">Arena Sport 8 Serbia</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ArenaSport9.hr" site_id="rs/tvprogram#arena-sport-9-hr">Arena Sport 9 Croatia</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="ARTE.fr" site_id="al/programacioni#arte-de">ARTE Deutsch</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="arte.fr" site_id="al/programacioni#arte-de">ARTE Deutsch</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ATV.at" site_id="al/programacioni#atv1">ATV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ATV.hu" site_id="hu/tvmusor#atv-hu">ATV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ATVAvrupa.tr" site_id="mk/tv-raspored#atv-avrupa">ATV Avrupa</channel>
@@ -420,7 +420,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="RTV21.xk" site_id="mk/tv-raspored#rtv21">RTV 21 Sat</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="Russia24.ru" site_id="ba/tvprogram#rossija24">Rossiya 24</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SAT1.de" site_id="al/programacioni#sat-1">Sat. 1</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="SAT1GOLD.de" site_id="al/programacioni#sat-1-gold">Sat. 1 Gold</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="SAT1Gold.de" site_id="al/programacioni#sat-1-gold">Sat. 1 Gold</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SBNTVInternational.us" site_id="de/tvprogramm#sonlife">SBN International</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SciFi.rs" site_id="al/programacioni#scifi">Scifi Srbija</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ShowTurk.tr" site_id="al/programacioni#show-turk">Show Turk</channel>
@@ -458,7 +458,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="StingrayiConcerts.ca" site_id="ba/tvprogram#stingray-iconcerts">Stingray IConcerts</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="Story4.hu" site_id="hu/tvmusor#story4">Story4</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="StudioB.rs" site_id="ba/tvprogram#studio-b-yu">Studio B</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="SuperRTL.de" site_id="al/programacioni#super-rtl">Super RTL</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="RTLSuper.de" site_id="al/programacioni#super-rtl">Super RTL</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SUPERSTARTV.rs" site_id="ba/tvprogram#superstar-tv">Superstar TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SuperTennis.it" site_id="ba/tvprogram#supertennis-hd">Super Tennis</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="SuperTV2.hu" site_id="hu/tvmusor#super-tv2">Super TV2</channel>
diff --git a/sites/tvtv.us/tvtv.us.channels.xml b/sites/tvtv.us/tvtv.us.channels.xml
index ba5ce50b..376ff51d 100644
--- a/sites/tvtv.us/tvtv.us.channels.xml
+++ b/sites/tvtv.us/tvtv.us.channels.xml
@@ -320,7 +320,7 @@
   <channel site="tvtv.us" lang="en" xmltv_id="HSN2.us" site_id="10270">HSN2</channel>
   <channel site="tvtv.us" lang="en" xmltv_id="HTV.us" site_id="15969">HTV</channel>
   <channel site="tvtv.us" lang="en" xmltv_id="HumTV.pk" site_id="66899">Hum TV</channel>
-  <channel site="tvtv.us" lang="en" xmltv_id="I24NewsEnglish.il" site_id="87376">i24 News English</channel>
+  <channel site="tvtv.us" lang="en" xmltv_id="i24NEWSEnglishUSA.il" site_id="87376">i24 News English</channel>
   <channel site="tvtv.us" lang="en" xmltv_id="IFCEast.us" site_id="14873">IFC East</channel>
   <channel site="tvtv.us" lang="en" xmltv_id="IFCWest.us" site_id="61866">IFC West</channel>
   <channel site="tvtv.us" lang="en" xmltv_id="ImpactNetwork.us" site_id="71798">Impact Network</channel>
diff --git a/sites/vidio.com/vidio.com.channels.xml b/sites/vidio.com/vidio.com.channels.xml
index 1e76b5d0..106ac3d1 100644
--- a/sites/vidio.com/vidio.com.channels.xml
+++ b/sites/vidio.com/vidio.com.channels.xml
@@ -45,7 +45,7 @@
   <channel site="vidio.com" lang="id" xmltv_id="NET.id" site_id="875">NET</channel>
   <channel site="vidio.com" lang="id" xmltv_id="NHKWorldJapan.jp" site_id="7968">NHK World Japan</channel>
   <channel site="vidio.com" lang="id" xmltv_id="NusantaraTV.id" site_id="7432">Nusantara</channel>
-  <channel site="vidio.com" lang="id" xmltv_id="OChannel.id" site_id="206">MOJI</channel>
+  <channel site="vidio.com" lang="id" xmltv_id="Moji.id" site_id="206">MOJI</channel>
   <channel site="vidio.com" lang="id" xmltv_id="RajawaliTV.id" site_id="1561">RTV</channel>
   <channel site="vidio.com" lang="id" xmltv_id="RANSEntertainment.id" site_id="8241">RANS Channel</channel>
   <channel site="vidio.com" lang="id" xmltv_id="Reformed21.id" site_id="6853">Reformed 21 TV</channel>
diff --git a/sites/vivacom.bg/vivacom.bg.channels.xml b/sites/vivacom.bg/vivacom.bg.channels.xml
index 7de3ac88..a22ad8b9 100644
--- a/sites/vivacom.bg/vivacom.bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg.channels.xml
@@ -114,7 +114,7 @@
   <channel site="vivacom.bg" lang="bg" xmltv_id="VTK.bg" site_id="9#ВТК">VTK</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="WnessTV.bg" site_id="2#WNESS TV">Wness TV</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="XXL.fr" site_id="22#XXL">XXL</channel>
-  <channel site="vivacom.bg" lang="de" xmltv_id="AutoMotorundSport.de" site_id="4#Auto Motor Sport">Auto Motor und Sport</channel>
+  <channel site="vivacom.bg" lang="de" xmltv_id="automotorundsportchannel.de" site_id="4#Auto Motor Sport">Auto Motor und Sport</channel>
   <channel site="vivacom.bg" lang="de" xmltv_id="Jukebox.de" site_id="14#Jukebox">Jukebox</channel>
   <channel site="vivacom.bg" lang="de" xmltv_id="Motorvision.de" site_id="4#Motorvision">Motorvision TV</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="360TuneBox.nl" site_id="19#360 Tunebox">360 Tune Box</channel>
diff --git a/sites/web.magentatv.de/web.magentatv.de.channels.xml b/sites/web.magentatv.de/web.magentatv.de.channels.xml
index 885df6a8..29310b95 100644
--- a/sites/web.magentatv.de/web.magentatv.de.channels.xml
+++ b/sites/web.magentatv.de/web.magentatv.de.channels.xml
@@ -114,8 +114,8 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="AnixeHDSerie.de" site_id="4777">ANIXE HD Serie</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="AnixePlus.de" site_id="452">ANIXE+</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ARDalpha.de" site_id="479">ARD-alpha</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="ARTE.de" site_id="394">ARTE</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="AutoMotorundSport.de" site_id="108">auto motor und sport</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="arte.de" site_id="394">ARTE</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="automotorundsportchannel.de" site_id="108">auto motor und sport</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="AXNBlack.de" site_id="110">AXN Black</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="BabyTV.uk" site_id="109">Baby TV</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="BadenTV.de" site_id="3685">Baden TV</channel>
@@ -167,12 +167,12 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="Heimatkanal.de" site_id="661">Heimatkanal</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="HGTV.us" site_id="3583">HGTV</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="History.de" site_id="162">The HISTORY Channel</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="HRFernsehen.de" site_id="386">hr-fernsehen</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="hrfernsehen.de" site_id="386">hr-fernsehen</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="HSE.de" site_id="451">HSE</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ITVNEurope.pl" site_id="474">iTVN</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Jukebox.de" site_id="218">Jukebox</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="kabeleins.de" site_id="405">Kabel Eins</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="kabeleinsclassics.de" site_id="157">Kabel Eins CLASSICS</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="kabeleinsClassics.de" site_id="157">Kabel Eins CLASSICS</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="kabeleinsDoku.de" site_id="573">Kabel Eins Doku</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Kanal7.tr" site_id="29">Kanal 7</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="KiKA.de" site_id="387">KiKA</channel>
@@ -217,7 +217,7 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="One.de" site_id="402">ONE</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="OstWest.de" site_id="476">OstWest</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="PenthousePassion.us" site_id="228">Penthouse Passion</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="Phoenix.de" site_id="371">phoenix</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="phoenix.de" site_id="371">phoenix</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="PlayboyTVEurope.us" site_id="34">Playboy Europe</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ProSieben.de" site_id="374">ProSieben</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ProSiebenFun.de" site_id="259">ProSieben FUN</channel>
@@ -227,7 +227,7 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="Rai1.it" site_id="43">Rai 1</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Rai2.it" site_id="46">Rai 2</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Rai3.it" site_id="210">Rai 3</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="RBBBerlin.de" site_id="384">rbb fernsehen Berlin</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="rbbFernsehenBerlin.de" site_id="384">rbb fernsehen Berlin</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="RBBBrandenburg.de" site_id="242">rbb fernsehen Brandenburg</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="RedBullTV.at" site_id="5027">Red Bull TV</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="RennsteigTV.de" site_id="2609">Rennsteig.TV</channel>
@@ -252,13 +252,13 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="SalveTV.de" site_id="3073">salve.tv</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SAT1.de" site_id="381">SAT.1</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SAT1emotions.de" site_id="224">SAT.1 emotions</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="SAT1GOLD.de" site_id="338">SAT.1 GOLD</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="SAT1Gold.de" site_id="338">SAT.1 GOLD</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SAT1NRW.de" site_id="251">SAT.1 Nordrhein-Westfalen</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ServusTV.at" site_id="39">ServusTV</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ShopLC.us" site_id="5172">Shop LC</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ShowMax.tr" site_id="3827">Show Max</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="ShowTurk.tr" site_id="215">Show Turk</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="Sixx.de" site_id="380">sixx</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="sixx.de" site_id="380">sixx</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SkyAtlantic.de" site_id="264">Sky Atlantic</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SkyCinemaAction.de" site_id="40">Sky Cinema Action</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SkyCinemaBestOf.de" site_id="263">Sky Cinema Best of</channel>
@@ -302,15 +302,15 @@
   <channel site="web.magentatv.de" lang="de" xmltv_id="SpiegelGeschichte.de" site_id="4406">Spiegel Geschichte</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Sport1.de" site_id="401">SPORT1</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Sport1Plus.de" site_id="44">SPORT1+</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="Sportdigital.de" site_id="194">SPORTDIGITAL FUSSBALL</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="SportdigitalFUSSBALL.de" site_id="194">SPORTDIGITAL FUSSBALL</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SRFernsehen.de" site_id="379">SR Fernsehen</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="Studio47.de" site_id="2616">Studio 47</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="SuperRTL.de" site_id="403">Super RTL</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="RTLSuper.de" site_id="403">Super RTL</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SWRFernsehenBadenWurttemberg.de" site_id="398">SWR Fernsehen BW</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SWRFernsehenRheinlandPfalz.de" site_id="393">SWR Fernsehen RP</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="SYFY.de" site_id="133">SYFY</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="tagesschau24.de" site_id="400">tagesschau24</channel>
-  <channel site="web.magentatv.de" lang="de" xmltv_id="Tele5.de" site_id="48">TELE 5</channel>
+  <channel site="web.magentatv.de" lang="de" xmltv_id="TELE5.de" site_id="48">TELE 5</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="TelebomTeledom.de" site_id="483">TeleBom/TeleDom</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="TLC.de" site_id="383">TLC</channel>
   <channel site="web.magentatv.de" lang="de" xmltv_id="TOGGOplus.de" site_id="601">TOGGO plus</channel>
diff --git a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
index a56bbcb8..aa061876 100644
--- a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
+++ b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
@@ -50,7 +50,7 @@
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="192TV.nl" site_id="98">192TV</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="A1TV.nl" site_id="10044">A1 TV</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="AAVISIE.nl" site_id="10000">AAVISIE</channel>
-  <channel site="webtv.delta.nl" lang="nl" xmltv_id="ARTE.fr" site_id="61">ARTE</channel>
+  <channel site="webtv.delta.nl" lang="nl" xmltv_id="arte.fr" site_id="61">ARTE</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="AT5.nl" site_id="3093">AT5</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="ATOSTV.nl" site_id="3053">ATOS TV</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="AlbrandswaardTV.nl" site_id="3052">Albrandswaard TV</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv.channels.xml b/sites/ziggogo.tv/ziggogo.tv.channels.xml
index 307b4d8a..43bc909d 100644
--- a/sites/ziggogo.tv/ziggogo.tv.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
   <!-- <channel site="ziggogo.tv" lang="nl" xmltv_id="" site_id="NL_000066_019291">CBS Reality Europe</channel> -->
-  <channel site="ziggogo.tv" lang="de" xmltv_id="ARTE.fr" site_id="NL_000046_020053">ARTE France</channel>
+  <channel site="ziggogo.tv" lang="de" xmltv_id="arte.fr" site_id="NL_000046_020053">ARTE France</channel>
   <channel site="ziggogo.tv" lang="de" xmltv_id="NDRFernsehenHamburg.de" site_id="NL_000037_019186">NDR Fernsehen Hamburg</channel>
   <channel site="ziggogo.tv" lang="de" xmltv_id="RTL.de" site_id="NL_000038_019063">RTL</channel>
   <channel site="ziggogo.tv" lang="de" xmltv_id="SAT1.de" site_id="NL_000039_019153">Sat. 1 Deutschland</channel>