diff --git a/sites/hd-plus.de/hd-plus.de_de.channels.xml b/sites/hd-plus.de/hd-plus.de_de.channels.xml
index f0a8f6ff..896d3451 100644
--- a/sites/hd-plus.de/hd-plus.de_de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de_de.channels.xml
@@ -82,7 +82,7 @@
     <channel lang="de" xmltv_id="Sat1Germany.de" site_id="sat-1-hd">Sat. 1 Deutschland</channel>
     <channel lang="de" xmltv_id="Sat1Emotions.de" site_id="sat-1-emotions">Sat. 1 Emotions</channel>
     <channel lang="de" xmltv_id="Sat1GoldGermany.de" site_id="sat-1-gold-hd">Sat. 1 Gold Deutschland</channel>
-    <channel lang="de" xmltv_id="ServusTVGermany.at" site_id="servustv-hd-deutschland">Servus TV Deutschland</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="servustv-hd-deutschland">Servus TV Deutschland</channel>
     <channel lang="de" xmltv_id="SixxGermany.de" site_id="sixx-hd">Sixx Deutschland</channel>
     <channel lang="de" xmltv_id="SkyAtlantic.de" site_id="sky-atlantic-hd">Sky Atlantic</channel>
     <channel lang="de" xmltv_id="SkyCinemaAction.de" site_id="sky-action-hd">Sky Cinema Action</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index 11389469..e5b96bf9 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -159,7 +159,7 @@
     <channel lang="de" xmltv_id="Sat1Germany.de" site_id="DE#deu#lgi-obolite-de-prod-master:SAT1">SAT.1</channel>
     <channel lang="de" xmltv_id="Sat1GoldGermany.de" site_id="DE#deu#lgi-obolite-de-prod-master:SAT1_Gold">SAT.1 GOLD</channel>
     <channel lang="de" xmltv_id="SBNInternational.us" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_17122">SonLife</channel>
-    <channel lang="de" xmltv_id="ServusTVGermany.at" site_id="DE#deu#lgi-obolite-de-prod-master:Servus_TV">ServusTV</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="DE#deu#lgi-obolite-de-prod-master:Servus_TV">ServusTV</channel>
     <channel lang="de" xmltv_id="ShowMax.tr" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_25107">Show Max</channel>
     <channel lang="de" xmltv_id="ShowTurk.tr" site_id="DE#deu#lgi-obolite-de-prod-master:Show_Turk">SHOW TURK</channel>
     <channel lang="de" xmltv_id="SilverlineMovieChannel.de" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_58109">Silverline Movie Channel</channel>
diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index ad5f0a7a..891af2c8 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -126,7 +126,7 @@
     <channel lang="de" xmltv_id="Sat1GoldOsterreich.at" site_id="Sat_1_Gold_HD">Sat. 1 Gold Österreich</channel>
     <channel lang="de" xmltv_id="Sat1Osterreich.at" site_id="Sat_1_HD">Sat. 1 Österreich</channel>
     <channel lang="de" xmltv_id="SchauTV.at" site_id="Schau_TV_HD">Schau TV</channel>
-    <channel lang="de" xmltv_id="ServusTVOsterreich.at" site_id="Servus_TV_HD">Servus TV Österreich</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="Servus_TV_HD">Servus TV Österreich</channel>
     <channel lang="de" xmltv_id="SixxAustria.at" site_id="Sixx_Austria_HD">Sixx Austria</channel>
     <channel lang="de" xmltv_id="SkyAtlantic.de" site_id="Sky_Atlantic_HD">Sky Atlantic HD</channel>
     <channel lang="de" xmltv_id="SkyCinemaActionHD.de" site_id="Sky_Cinema_Action_HD">Sky Cinema Action HD</channel>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index 067eb594..6506cb9f 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -163,7 +163,7 @@
     <channel lang="de" xmltv_id="Sat1NiedersachsenundBremen.de" site_id="144">SAT.1 NDS Bremen</channel>
     <channel lang="de" xmltv_id="Sat1NRW.de" site_id="251">SAT.1 NRW</channel>
     <channel lang="de" xmltv_id="Sat1RheinlandPfalzHessen.de" site_id="145">SAT.1 RhlPf Hessen</channel>
-    <channel lang="de" xmltv_id="ServusTVGermany.at" site_id="39">ServusTV</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="39">ServusTV</channel>
     <channel lang="de" xmltv_id="ShopLC.us" site_id="5172">Shop LC</channel>
     <channel lang="de" xmltv_id="ShowMax.tr" site_id="3827">Show Max</channel>
     <channel lang="de" xmltv_id="ShowTurk.tr" site_id="215">Show Turk</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index 3c60ff56..f04954da 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -141,7 +141,7 @@
     <channel lang="de" xmltv_id="Sat1GoldGermany.de" site_id="377">Sat. 1 Gold Deutschland</channel>
     <channel lang="de" xmltv_id="SchaffhauserFernsehen.ch" site_id="382">Schaffhauser Fernsehen</channel>
     <channel lang="de" xmltv_id="SchlagerDeluxe.de" site_id="1714">Schlager Deluxe</channel>
-    <channel lang="de" xmltv_id="ServusTVGermany.at" site_id="381">Servus TV Deutschland</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="381">Servus TV Deutschland</channel>
     <channel lang="de" xmltv_id="SixxGermany.de" site_id="385">Sixx Deutschland</channel>
     <channel lang="de" xmltv_id="SonyChannelGermany.us" site_id="1083">Sony Channel Deutschland</channel>
     <channel lang="de" xmltv_id="SpiegelGeschichte.de" site_id="395">Spiegel Geschichte</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 1962a30e..753e1b03 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
@@ -193,7 +193,7 @@
     <channel lang="sl" xmltv_id="RTVVikom.ba" site_id="1000188">RTV Vikom</channel>
     <channel lang="sl" xmltv_id="Sat1Germany.de" site_id="72">Sat. 1</channel>
     <channel lang="sl" xmltv_id="ScifiSerbia.rs" site_id="1000614">Scifi Srbija</channel>
-    <channel lang="sl" xmltv_id="ServusTVOsterreich.at" site_id="1000086">Servus TV Österreich</channel>
+    <channel lang="sl" xmltv_id="ServusTV.at" site_id="1000086">Servus TV Österreich</channel>
     <channel lang="sl" xmltv_id="SexationTV.si" site_id="1000408">Sexation TV</channel>
     <channel lang="sl" xmltv_id="SIPTV.si" site_id="1000498">SIP TV</channel>
     <channel lang="sl" xmltv_id="Sitel.mk" site_id="1000201">Sitel TV</channel>
diff --git a/sites/tvheute.at/tvheute.at_at.channels.xml b/sites/tvheute.at/tvheute.at_at.channels.xml
index a2f37206..3ac9c2e7 100644
--- a/sites/tvheute.at/tvheute.at_at.channels.xml
+++ b/sites/tvheute.at/tvheute.at_at.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="de" xmltv_id="RTLZweiAustria.at" site_id="rtl2">RTL Zwei Austria</channel>
     <channel lang="de" xmltv_id="Sat1GoldOsterreich.at" site_id="sat1gold">Sat. 1 Gold Österreich</channel>
     <channel lang="de" xmltv_id="Sat1Osterreich.at" site_id="sat1">Sat. 1 Österreich</channel>
-    <channel lang="de" xmltv_id="ServusTVOsterreich.at" site_id="servustv">Servus TV Österreich</channel>
+    <channel lang="de" xmltv_id="ServusTV.at" site_id="servustv">Servus TV Österreich</channel>
     <channel lang="de" xmltv_id="SixxAustria.at" site_id="sixx">Sixx Austria</channel>
     <channel lang="de" xmltv_id="SkyCinemaPremieren.de" site_id="skyci">Sky Cinema Premieren</channel>
     <channel lang="de" xmltv_id="SkySport1.de" site_id="skysp1">Sky Sport 1</channel>