diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
index 87791c73..484ba5d5 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
@@ -140,11 +140,11 @@
     <channel lang="hr" xmltv_id="SportskaTV.hr" site_id="96">Sportska TV</channel>
     <channel lang="hr" xmltv_id="StingrayClassica.ca" site_id="299">Stingray Classica</channel>
     <channel lang="hr" xmltv_id="StingrayDJAZZ.ca" site_id="267">Stingray Djazz</channel>
-    <channel lang="hr" xmltv_id="SuperRTLGermany.de" site_id="323">Super RTL Deutschland</channel>
+    <channel lang="hr" xmltv_id="SuperRTL.de" site_id="323">Super RTL Deutschland</channel>
     <channel lang="hr" xmltv_id="TRTWorld.tr" site_id="773">TRT World</channel>
     <channel lang="hr" xmltv_id="TV1000East.ru" site_id="442">TV 1000 Balkan</channel>
     <channel lang="hr" xmltv_id="TV5MondeEurope.fr" site_id="262">TV5Monde Europe</channel>
-    <channel lang="hr" xmltv_id="TVCGSat.me" site_id="282">TVCG Sat</channel>
+    <channel lang="hr" xmltv_id="TVCGMNE.me" site_id="282">TVCG Sat</channel>
     <channel lang="hr" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="263">TVE Internacional Europa</channel>
     <channel lang="hr" xmltv_id="TVKoperCapodistria.si" site_id="771">TV Koper-Capodistria</channel>
     <channel lang="hr" xmltv_id="TVSLO1.si" site_id="283">TV Slovenija 1</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
index 020d2d38..d87b8eff 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="pl" xmltv_id="AnimalPlanetPoland.pl" site_id="animal-planet-hd-284">Animal Planet Polska</channel>
     <channel lang="pl" xmltv_id="ARDalpha.de" site_id="ard-alpha-252">ARD Alpha</channel>
     <channel lang="pl" xmltv_id="ArirangWorld.kr" site_id="arirang-tv-30">Arirang World</channel>
-    <channel lang="pl" xmltv_id="ARTE.fr" site_id="arte-253">ARTE Deutsch</channel>
+    <channel lang="pl" xmltv_id="ARTEFrance.fr" site_id="arte-253">ARTE Deutsch</channel>
     <channel lang="pl" xmltv_id="ATV.at" site_id="atv-251">ATV</channel>
     <channel lang="pl" xmltv_id="Automotolachaine.fr" site_id="ab-moteurs-242">Automoto la chaîne</channel>
     <channel lang="pl" xmltv_id="AXNBlack.us" site_id="axn-black-271">AXN Black</channel>
@@ -183,7 +183,7 @@
     <channel lang="pl" xmltv_id="NickJrPoland.pl" site_id="nick-jr-45">Nick Jr</channel>
     <channel lang="pl" xmltv_id="NickMusic.us" site_id="viva-polska-10">NickMusic</channel>
     <channel lang="pl" xmltv_id="NicktoonsPoland.pl" site_id="nickelodeon-hd-44">Nicktoons Polska</channel>
-    <channel lang="pl" xmltv_id="NitroGermany.de" site_id="rtl-nitro-545">Nitro Deutschland</channel>
+    <channel lang="pl" xmltv_id="Nitro.de" site_id="rtl-nitro-545">Nitro Deutschland</channel>
     <channel lang="pl" xmltv_id="NovelaTV.pl" site_id="novela-tv-461">Novela TV</channel>
     <channel lang="pl" xmltv_id="NowaTV.pl" site_id="nowa-tv-528">Nowa TV</channel>
     <channel lang="pl" xmltv_id="NPO1.nl" site_id="npo-1-385">NPO 1</channel>
@@ -282,7 +282,7 @@
     <channel lang="pl" xmltv_id="StopklatkaTV.pl" site_id="stopklatka-tv-185">Stopklatka TV</channel>
     <channel lang="pl" xmltv_id="SundanceTVPoland.pl" site_id="sundance-channel-237">Sundance TV Europe</channel>
     <channel lang="pl" xmltv_id="SuperPolsat.pl" site_id="super-polsat-541">Super Polsat</channel>
-    <channel lang="pl" xmltv_id="SuperRTLGermany.de" site_id="super-rtl-400">Super RTL Deutschland</channel>
+    <channel lang="pl" xmltv_id="SuperRTL.de" site_id="super-rtl-400">Super RTL Deutschland</channel>
     <channel lang="pl" xmltv_id="Superstacja.pl" site_id="superstacja-69">Superstacja</channel>
     <channel lang="pl" xmltv_id="SyfyGermany.de" site_id="syfy-402">Syfy Deutschland</channel>
     <channel lang="pl" xmltv_id="TBNPoland.pl" site_id="tbn-polska-598">TBN Polska</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index ab5dbfc3..981f811f 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="en" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="en" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
-    <channel lang="en" xmltv_id="ARTE.fr" site_id="24">ARTE Français</channel>
+    <channel lang="en" xmltv_id="ARTEFrance.fr" site_id="24">ARTE Français</channel>
     <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News Europe</channel>
     <channel lang="en" xmltv_id="BloombergTVEurope.uk" site_id="81">Bloomberg TV Europe</channel>
@@ -102,7 +102,7 @@
     <channel lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
     <channel lang="en" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="en" xmltv_id="CTCBaltics.ru" site_id="1087">STS Baltic</channel>
-    <channel lang="en" xmltv_id="SuperRTLGermany.de" site_id="17">Super RTL Deutschland</channel>
+    <channel lang="en" xmltv_id="SuperRTL.de" site_id="17">Super RTL Deutschland</channel>
     <channel lang="en" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
     <channel lang="en" xmltv_id="TBNBaltia.ee" site_id="261">TBN Baltia</channel>
     <channel lang="en" xmltv_id="Telecafe.ru" site_id="703">Telecafé International</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index bd3521b1..333e2127 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="et" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="et" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="et" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
-    <channel lang="et" xmltv_id="ARTE.fr" site_id="24">ARTE</channel>
+    <channel lang="et" xmltv_id="ARTEFrance.fr" site_id="24">ARTE</channel>
     <channel lang="et" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth</channel>
     <channel lang="et" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News</channel>
     <channel lang="et" xmltv_id="BloombergTVEurope.uk" site_id="81">Bloomberg TV</channel>
@@ -100,7 +100,7 @@
     <channel lang="et" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
     <channel lang="et" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="et" xmltv_id="CTCBaltics.ru" site_id="1087">STS Baltic</channel>
-    <channel lang="et" xmltv_id="SuperRTLGermany.de" site_id="17">Super RTL</channel>
+    <channel lang="et" xmltv_id="SuperRTL.de" site_id="17">Super RTL</channel>
     <channel lang="et" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
     <channel lang="et" xmltv_id="TBNBaltia.ee" site_id="261">TBN</channel>
     <channel lang="et" xmltv_id="Telecafe.ru" site_id="703">Telecafé</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index 4c7ed2f6..41e64d8c 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="ru" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
     <channel lang="ru" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
-    <channel lang="ru" xmltv_id="ARTE.fr" site_id="24">ARTE Français</channel>
+    <channel lang="ru" xmltv_id="ARTEFrance.fr" site_id="24">ARTE Français</channel>
     <channel lang="ru" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News Europe</channel>
     <channel lang="en" xmltv_id="BloombergTVEurope.uk" site_id="81">Bloomberg TV Europe</channel>
@@ -102,7 +102,7 @@
     <channel lang="ru" xmltv_id="StingrayDJAZZ.ca" site_id="1129">Stingray Djazz</channel>
     <channel lang="ru" xmltv_id="StingrayiConcerts.ca" site_id="731">Stingray IConcerts</channel>
     <channel lang="ru" xmltv_id="CTCBaltics.ru" site_id="1087">STS Baltic</channel>
-    <channel lang="ru" xmltv_id="SuperRTLGermany.de" site_id="17">Super RTL Deutschland</channel>
+    <channel lang="ru" xmltv_id="SuperRTL.de" site_id="17">Super RTL Deutschland</channel>
     <channel lang="ru" xmltv_id="TaevasTV7.fi" site_id="248">Taevas TV7</channel>
     <channel lang="ru" xmltv_id="TBNBaltia.ee" site_id="261">TBN Baltia</channel>
     <channel lang="ru" xmltv_id="Telecafe.ru" site_id="703">Telecafé International</channel>
diff --git a/sites/tv.nu/tv.nu_se.channels.xml b/sites/tv.nu/tv.nu_se.channels.xml
index da405725..6d0c7125 100644
--- a/sites/tv.nu/tv.nu_se.channels.xml
+++ b/sites/tv.nu/tv.nu_se.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="sv" xmltv_id="AdultChannel.uk" site_id="adult-channel">Adult Channel (UK)</channel>
     <channel lang="sv" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera-english">Al Jazeera English</channel>
     <channel lang="sv" xmltv_id="AnimalPlanetSweden.se" site_id="animal-planet">Animal Planet</channel>
-    <channel lang="sv" xmltv_id="ARTE.fr" site_id="arte">ARTE</channel>
+    <channel lang="sv" xmltv_id="ARTEFrance.fr" site_id="arte">ARTE</channel>
     <channel lang="sv" xmltv_id="ATGLive.se" site_id="atg-live">ATG Live</channel>
     <channel lang="sv" xmltv_id="AxessTV.se" site_id="axess-tv">Axess TV</channel>
     <channel lang="sv" xmltv_id="BBCBritNordic.uk" site_id="bbc-brit">BBC Brit</channel>
@@ -123,7 +123,7 @@
     <channel lang="sv" xmltv_id="Sportkanalen.se" site_id="sportkanalen">Sportkanalen</channel>
     <channel lang="sv" xmltv_id="StingrayClassica.ca" site_id="stingray-classic">Stingray Classica</channel>
     <channel lang="sv" xmltv_id="StingrayDJAZZ.ca" site_id="djazz-hd">Djazz HD</channel>
-    <channel lang="sv" xmltv_id="SuperRTLGermany.de" site_id="super-rtl">Super RTL</channel>
+    <channel lang="sv" xmltv_id="SuperRTL.de" site_id="super-rtl">Super RTL</channel>
     <channel lang="sv" xmltv_id="SVT1.se" site_id="svt1">SVT1</channel>
     <channel lang="sv" xmltv_id="SVT2.se" site_id="svt2">SVT2</channel>
     <channel lang="sv" xmltv_id="SVT24.se" site_id="svt24">SVT24</channel>
diff --git a/sites/tv24.se/tv24.se_se.channels.xml b/sites/tv24.se/tv24.se_se.channels.xml
index 89524065..91e94d8b 100644
--- a/sites/tv24.se/tv24.se_se.channels.xml
+++ b/sites/tv24.se/tv24.se_se.channels.xml
@@ -128,7 +128,7 @@
     <channel lang="sv" xmltv_id="SkyShowtime2.se" site_id="skyshowtime-2">Sky Showtime 2</channel>
     <channel lang="sv" xmltv_id="Sportkanalen.se" site_id="sportkanalen">Sportkanalen</channel>
     <channel lang="sv" xmltv_id="StingrayDJAZZ.ca" site_id="djazz-hd">Djazz HD</channel>
-    <channel lang="sv" xmltv_id="SuperRTLGermany.de" site_id="super-rtl">Super RTL</channel>
+    <channel lang="sv" xmltv_id="SuperRTL.de" site_id="super-rtl">Super RTL</channel>
     <channel lang="sv" xmltv_id="SVT1.se" site_id="svt1">SVT1</channel>
     <channel lang="sv" xmltv_id="SVT2.se" site_id="svt2">SVT2</channel>
     <channel lang="sv" xmltv_id="SVT24.se" site_id="svt24">SVT24</channel>
@@ -160,7 +160,7 @@
     <channel lang="sv" xmltv_id="TV5MondeEurope.fr" site_id="tv5-monde-europe">TV5 Monde Europe</channel>
     <channel lang="sv" xmltv_id="TV6Sweden.se" site_id="tv6">TV6</channel>
     <channel lang="sv" xmltv_id="TV8Sweden.se" site_id="tv8">TV8</channel>
-    <channel lang="sv" xmltv_id="TVCGSat.me" site_id="tvcg-sat">TVCG Sat</channel>
+    <channel lang="sv" xmltv_id="TVCGMNE.me" site_id="tvcg-sat">TVCG Sat</channel>
     <channel lang="sv" xmltv_id="TVChile.cl" site_id="tv-chile-internacional">TV Chile</channel>
     <channel lang="sv" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="tve-internacional">TVE Internacional</channel>
     <channel lang="sv" xmltv_id="TVNorge.no" site_id="tvnorge">TVNorge</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index 8fc9f2c1..1461a7e9 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -15,7 +15,7 @@
     <channel lang="sl" xmltv_id="ArenaSport2.rs" site_id="1000689">Arena Sport 2</channel>
     <channel lang="sl" xmltv_id="ArenaSport3.rs" site_id="1000787">Arena Sport 3</channel>
     <channel lang="sl" xmltv_id="ArenaSport4.rs" site_id="1000788">Arena Sport 4</channel>
-    <channel lang="sl" xmltv_id="ARTE.fr" site_id="1000026">ARTE Français</channel>
+    <channel lang="sl" xmltv_id="ARTEFrance.fr" site_id="1000026">ARTE Français</channel>
     <channel lang="sl" xmltv_id="ATMTV.si" site_id="1000001">ATM TV</channel>
     <channel lang="sl" xmltv_id="B92.rs" site_id="1000207">B92</channel>
     <channel lang="sl" xmltv_id="BabyTV.uk" site_id="82">Baby TV</channel>
@@ -214,7 +214,7 @@
     <channel lang="sl" xmltv_id="StingrayFestival4K.ca" site_id="1000527">Stingray Festival 4K</channel>
     <channel lang="sl" xmltv_id="STVSkledar.si" site_id="1000052">S-TV Skledar</channel>
     <channel lang="sl" xmltv_id="SuperOne.hu" site_id="1000342">SuperOne HD</channel>
-    <channel lang="sl" xmltv_id="SuperRTLGermany.de" site_id="73">Super RTL</channel>
+    <channel lang="sl" xmltv_id="SuperRTL.de" site_id="73">Super RTL</channel>
     <channel lang="sl" xmltv_id="T2Info.si" site_id="1000543">T-2 Info</channel>
     <channel lang="sl" xmltv_id="Telecafe.ru" site_id="1000456">Telecafé</channel>
     <channel lang="sl" xmltv_id="TelmaTV.mk" site_id="1000226">Telma</channel>
@@ -241,7 +241,7 @@
     <channel lang="sl" xmltv_id="TVAS.si" site_id="122">TV AS</channel>
     <channel lang="sl" xmltv_id="TVCelje.si" site_id="1000065">TV Celje</channel>
     <channel lang="sl" xmltv_id="TVCentrInternational.ru" site_id="1000665">TV Centr</channel>
-    <channel lang="sl" xmltv_id="TVCGSat.me" site_id="109">TVCG Sat</channel>
+    <channel lang="sl" xmltv_id="TVCGMNE.me" site_id="109">TVCG Sat</channel>
     <channel lang="sl" xmltv_id="TVDugaPlus.rs" site_id="1000035">TV Duga +</channel>
     <channel lang="sl" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="98">TVE</channel>
     <channel lang="sl" xmltv_id="TVGaleja.si" site_id="1000343">TV Galeja</channel>