diff --git a/sites/cgates.lt/cgates.lt_lt.channels.xml b/sites/cgates.lt/cgates.lt_lt.channels.xml
index e0ee0b55..54c7f3bf 100644
--- a/sites/cgates.lt/cgates.lt_lt.channels.xml
+++ b/sites/cgates.lt/cgates.lt_lt.channels.xml
@@ -7,7 +7,7 @@
     <channel lang="lt" xmltv_id="366TV.ua" site_id="36-6-tv">36.6 TV</channel>
     <channel lang="lt" xmltv_id="ArirangTV.kr" site_id="arirang-tv">Arirang TV</channel>
     <channel lang="lt" xmltv_id="BBCWorldNewsEurope.uk" site_id="bbc-world-news">BBC World News</channel>
-    <channel lang="lt" xmltv_id="BTVHD.lt" site_id="btv-hd">BTV HD</channel>
+    <channel lang="lt" xmltv_id="BTV.lt" site_id="btv-hd">BTV HD</channel>
     <channel lang="lt" xmltv_id="BabyTV.uk" site_id="baby-tv">Baby TV</channel>
     <channel lang="lt" xmltv_id="BalticumAuksinis.lt" site_id="balticum-auksinis">Balticum Auksinis</channel>
     <channel lang="lt" xmltv_id="BalticumPlatinum.lt" site_id="balticum-platinum-hd">Balticum Platinum HD</channel>
@@ -41,13 +41,13 @@
     <channel lang="lt" xmltv_id="France24French.fr" site_id="france-24">France 24</channel>
     <channel lang="lt" xmltv_id="GametoonHD.nl" site_id="game-toon-hd">Game Toon HD</channel>
     <channel lang="lt" xmltv_id="GulliGirl.ru" site_id="gulli-girl">Gulli Girl</channel>
-    <channel lang="lt" xmltv_id="InfoTVHD.lt" site_id="info-tv-hd">Info TV HD</channel>
+    <channel lang="lt" xmltv_id="InfoTV.lt" site_id="info-tv-hd">Info TV HD</channel>
     <channel lang="lt" xmltv_id="InterPlus.ua" site_id="inter-plus">Inter+</channel>
     <channel lang="lt" xmltv_id="JimJamEurope.uk" site_id="jim-jam">Jim Jam</channel>
     <channel lang="lt" xmltv_id="KidZoneMini.ee" site_id="kidzone-plus-hd">KidZone Mini HD</channel>
     <channel lang="lt" xmltv_id="KidZoneTV.ee" site_id="kidzone-tv">KidZone TV</channel>
     <channel lang="lt" xmltv_id="KusKus.ua" site_id="kus-kus">Kus-Kus</channel>
-    <channel lang="lt" xmltv_id="LNKHD.lt" site_id="lnk-hd">LNK HD</channel>
+    <channel lang="lt" xmltv_id="LNK.lt" site_id="lnk-hd">LNK HD</channel>
     <channel lang="lt" xmltv_id="LRTLituanica.lt" site_id="lrt-lituanica">LRT Lituanica</channel>
     <channel lang="lt" xmltv_id="LRTPlius.lt" site_id="lrt-kultura-hd">LRT Plius HD</channel>
     <channel lang="lt" xmltv_id="LRTTV.lt" site_id="lrt-televizija-hd">LRT Televizija HD</channel>
@@ -67,15 +67,15 @@
     <channel lang="lt" xmltv_id="TV1000ActionEast.ru" site_id="tv-1000-action">TV 1000 Action</channel>
     <channel lang="lt" xmltv_id="TV1000East.ru" site_id="tv-1000">TV 1000</channel>
     <channel lang="lt" xmltv_id="TV1000WorldKino.ru" site_id="tv-1000-world-kino">TV 1000 World Kino</channel>
-    <channel lang="lt" xmltv_id="TV1HD.lt" site_id="tv1-hd">TV1 HD</channel>
+    <channel lang="lt" xmltv_id="TV1.lt" site_id="tv1-hd">TV1 HD</channel>
     <channel lang="lt" xmltv_id="TV3Film.lv" site_id="tv-1000-premium-hd">TV3 Film HD</channel>
-    <channel lang="lt" xmltv_id="TV3HDLithuania.lt" site_id="tv3-hd">TV3 HD</channel>
+    <channel lang="lt" xmltv_id="TV3Lithuania.lt" site_id="tv3-hd">TV3 HD</channel>
     <channel lang="lt" xmltv_id="TV3Plus.lv" site_id="tv3-plus-hd">TV3 Plus HD</channel>
     <channel lang="lt" xmltv_id="TV3Sport.uk" site_id="viasat-sport-baltic-hd">TV3 Sport HD</channel>
     <channel lang="lt" xmltv_id="TV3Sport2.uk" site_id="tvplay-sports-plus-hd">TV3 Sport 2 HD</channel>
     <channel lang="lt" xmltv_id="TV3SportOpenHD.uk" site_id="tv3-sport-open-hd">TV3 Sport Open HD</channel>
-    <channel lang="lt" xmltv_id="TV6HDLithuania.lt" site_id="tv6-hd">TV6 HD</channel>
-    <channel lang="lt" xmltv_id="TV8HDLithuania.lt" site_id="tv8-hd">TV8 HD</channel>
+    <channel lang="lt" xmltv_id="TV6Lithuania.lt" site_id="tv6-hd">TV6 HD</channel>
+    <channel lang="lt" xmltv_id="TV8Lithuania.lt" site_id="tv8-hd">TV8 HD</channel>
     <channel lang="lt" xmltv_id="TVBolt.ua" site_id="bolt">Bolt</channel>
     <channel lang="lt" xmltv_id="TVPInfo.pl" site_id="tvp-info">TVP Info</channel>
     <channel lang="lt" xmltv_id="TVPPolonia.pl" site_id="tvp-polonia">TVP Polonia</channel>
diff --git a/sites/delta.nl/delta.nl_nl.channels.xml b/sites/delta.nl/delta.nl_nl.channels.xml
index 1d56cdbe..d87f655a 100644
--- a/sites/delta.nl/delta.nl_nl.channels.xml
+++ b/sites/delta.nl/delta.nl_nl.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="nl" xmltv_id="100NLTV.nl" site_id="34">100% NL TV</channel>
     <channel lang="nl" xmltv_id="192TV.nl" site_id="98">192 TV</channel>
-    <channel lang="nl" xmltv_id="24KitchenNetherlands.nl" site_id="19">24 Kitchen Nederland</channel>
+    <channel lang="nl" xmltv_id="24Kitchen.nl" site_id="19">24 Kitchen</channel>
     <channel lang="nl" xmltv_id="3sat.de" site_id="3016">3sat</channel>
     <channel lang="nl" xmltv_id="AAVISIE.nl" site_id="10000">AAVISIE</channel>
     <channel lang="nl" xmltv_id="AlbrandswaardTV.nl" site_id="3052">Albrandswaard TV</channel>
diff --git a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
index fd3bd02e..dd1fe8e4 100644
--- a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
+++ b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="dsmart.com.tr">
   <channels>
-    <channel lang="tr" xmltv_id="24KitchenTurkey.us" site_id="58d29bb0eefad3db9c60627b">24 Kitchen Türkiye</channel>
+    <channel lang="tr" xmltv_id="24KitchenTurkey.tr" site_id="58d29bb0eefad3db9c60627b">24 Kitchen Türkiye</channel>
     <channel lang="tr" xmltv_id="24TV.tr" site_id="58d29bb0eefad3db9c60622e">24 TV</channel>
     <channel lang="tr" xmltv_id="360.tr" site_id="58d29bb0eefad3db9c606236">360</channel>
     <channel lang="tr" xmltv_id="AHaber.tr" site_id="58d29bb0eefad3db9c60625e">A Haber</channel>
diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
index 507cb946..e7dea878 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="turksatkablo.com.tr">
   <channels>
-    <channel lang="tr" xmltv_id="24KitchenTurkey.us" site_id="552">24 Kitchen Türkiye</channel>
+    <channel lang="tr" xmltv_id="24KitchenTurkey.tr" site_id="552">24 Kitchen Türkiye</channel>
     <channel lang="tr" xmltv_id="24TV.tr" site_id="1883">24 TV</channel>
     <channel lang="tr" xmltv_id="360.tr" site_id="1884">360</channel>
     <channel lang="tr" xmltv_id="360TuneBox.nl" site_id="1844">360 Tune Box</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 25e8a194..4a1fd98f 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
@@ -2,7 +2,7 @@
 <site site="tv2go.t-2.net">
   <channels>
     <channel lang="sl" xmltv_id="3sat.de" site_id="1000640">3sat</channel>
-    <channel lang="sl" xmltv_id="24KitchenAdria.us" site_id="1000307">24 Kitchen</channel>
+    <channel lang="sl" xmltv_id="24KitchenSlovenia.si" site_id="1000307">24 Kitchen</channel>
     <channel lang="sl" xmltv_id="360TuneBox.nl" site_id="1000558">360 Tune Box</channel>
     <channel lang="sl" xmltv_id="A1TV.me" site_id="2000000050">A1 TV</channel>
     <channel lang="sl" xmltv_id="AgroTV.rs" site_id="1000686">Agro TV</channel>
diff --git a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
index a5965f79..f69cd754 100644
--- a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
+++ b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tvplus.com.tr">
   <channels>
-    <channel lang="tr" xmltv_id="24KitchenTurkey.us" site_id="108">24 Kitchen Türkiye</channel>
+    <channel lang="tr" xmltv_id="24KitchenTurkey.tr" site_id="108">24 Kitchen Türkiye</channel>
     <channel lang="tr" xmltv_id="24TV.tr" site_id="32">24 TV</channel>
     <channel lang="tr" xmltv_id="360.tr" site_id="86">360</channel>
     <channel lang="tr" xmltv_id="A2.tr" site_id="2">A2</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
index c501a5fd..85ab19a4 100644
--- a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="nl" xmltv_id="100NLTV.nl" site_id="NL_000133_019271">100% NL TV</channel>
     <channel lang="nl" xmltv_id="192TV.nl" site_id="NL_000134_019296">192 TV</channel>
-    <channel lang="nl" xmltv_id="24KitchenNetherlands.nl" site_id="NL_000024_019701">24 Kitchen Nederland</channel>
+    <channel lang="nl" xmltv_id="24Kitchen.nl" site_id="NL_000024_019701">24 Kitchen</channel>
     <channel lang="nl" xmltv_id="2MInternational.ma" site_id="NL_000051_019047">2M Monde</channel>
     <channel lang="nl" xmltv_id="ARTEDeutsch.de" site_id="NL_000046_020053">ARTE Deutsch</channel>
     <channel lang="nl" xmltv_id="AT5.nl" site_id="NL_000149_019210">AT5</channel>