diff --git a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
index 8fb2cef0..7864d34d 100644
--- a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
+++ b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="tr" xmltv_id="24TV.tr" site_id="178">24 TV</channel>
     <channel lang="tr" xmltv_id="360.tr" site_id="30">360</channel>
-    <channel lang="tr" xmltv_id="A2.tr" site_id="490">A2</channel>
+    <channel lang="tr" xmltv_id="A2TV.tr" site_id="490">A2</channel>
     <channel lang="tr" xmltv_id="AHaber.tr" site_id="301">A Haber</channel>
     <channel lang="tr" xmltv_id="AlJazeeraEnglish.qa" site_id="182">Aljazeera English</channel>
     <channel lang="tr" xmltv_id="APara.tr" site_id="519">A Para</channel>
diff --git a/sites/ipko.com/ipko.com_al.channels.xml b/sites/ipko.com/ipko.com_al.channels.xml
index bff04a7f..67350e1c 100644
--- a/sites/ipko.com/ipko.com_al.channels.xml
+++ b/sites/ipko.com/ipko.com_al.channels.xml
@@ -2,7 +2,7 @@
 <site site="ipko.com">
   <channels>
     <channel lang="hr" xmltv_id="24KitchenSerbia.rs" site_id="418">24 Kitchen</channel>
-    <channel lang="hr" xmltv_id="ABCNews.al" site_id="269">ABC News</channel>
+    <channel lang="hr" xmltv_id="ABCNewsAlbania.al" site_id="269">ABC News</channel>
     <channel lang="hr" xmltv_id="BabyTV.uk" site_id="413">Baby TV</channel>
     <channel lang="hr" xmltv_id="BangBang.al" site_id="274">Bang Bang</channel>
     <channel lang="hr" xmltv_id="BBCWorldNewsEurope.uk" site_id="386">BBC World News</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index f650a316..2172a126 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="cz" xmltv_id="4FunDance.pl" site_id="4Fun+Dance">4 Fun Dance</channel>
     <channel lang="cz" xmltv_id="4FunKids.pl" site_id="4Fun+Kids">4 Fun Kids</channel>
     <channel lang="cz" xmltv_id="4FunTV.pl" site_id="4Fun.TV">4 Fun TV</channel>
-    <channel lang="cz" xmltv_id="5Kanal.ua" site_id="5+Kanal">5 Kanal</channel>
+    <channel lang="cz" xmltv_id="Channel5Ukraine.ua" site_id="5+Kanal">5 Kanal</channel>
     <channel lang="cz" xmltv_id="7D7.ee" site_id="7D7TV">7D7</channel>
     <channel lang="cz" xmltv_id="AdventureTV.pl" site_id="Adventure+TV+%28pl%29">Adventure</channel>
     <channel lang="cz" xmltv_id="AlibiIreland.ie" site_id="Alibi+SD+Ireland">Alibi Ireland</channel>
diff --git a/sites/magticom.ge/magticom.ge_ge.channels.xml b/sites/magticom.ge/magticom.ge_ge.channels.xml
index d4e612ce..7df23ad3 100644
--- a/sites/magticom.ge/magticom.ge_ge.channels.xml
+++ b/sites/magticom.ge/magticom.ge_ge.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="magticom.ge">
   <channels>
-    <channel lang="ka" xmltv_id="1TV.ge" site_id="3">1 TV</channel>
+    <channel lang="ka" xmltv_id="FirstChannel.ge" site_id="3">1 TV</channel>
     <channel lang="ka" xmltv_id="2TV.ge" site_id="167">2 TV</channel>
     <channel lang="en" xmltv_id="360TuneBox.nl" site_id="264">360 Tune Box</channel>
     <channel lang="ru" xmltv_id="A1.ru" site_id="219">A1</channel>
@@ -11,7 +11,7 @@
     <channel lang="ka" xmltv_id="AjaraTV.ge" site_id="27">Ajara TV</channel>
     <channel lang="ru" xmltv_id="AmediaHit.ru" site_id="76">Amedia Hit</channel>
     <channel lang="ru" xmltv_id="AmediaPremium.ru" site_id="122">Amedia Premium</channel>
-    <channel lang="ru" xmltv_id="1TV.am" site_id="84">Armenia 1 TV</channel>
+    <channel lang="ru" xmltv_id="Armenia1.am" site_id="84">Armenia 1 TV</channel>
     <channel lang="ru" xmltv_id="AVTO24.ru" site_id="294">Avto 24</channel>
     <channel lang="ru" xmltv_id="AzTV.az" site_id="101">Az TV</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="284">BBC World News Europe</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index e8701941..3e7139aa 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -4,7 +4,6 @@
     <channel lang="sr" xmltv_id="24KitchenSerbia.rs" site_id="264#624">24 Kitchen</channel>
     <channel lang="sr" xmltv_id="101TV.rs" site_id="504#759">101 TV</channel>
     <channel lang="sr" xmltv_id="360TuneBox.nl" site_id="480#606">360 Tune Box</channel>
-    <channel lang="sr" xmltv_id="A1TV.me" site_id="653#335">A1 TV</channel>
     <channel lang="sr" xmltv_id="AgroTV.rs" site_id="126#147">Agro TV</channel>
     <channel lang="sr" xmltv_id="AlJazeeraBalkans.qa" site_id="654#25">Aljazeera Balkans</channel>
     <channel lang="sr" xmltv_id="AlternativnaTV.ba" site_id="657#530">Alternativna TV</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
index bfb23386..64ea58df 100644
--- a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
@@ -14,7 +14,7 @@
     <channel lang="en" xmltv_id="9Rush.au" site_id="au#3326/9rush">9 Rush</channel>
     <channel lang="en" xmltv_id="ABCKids.au" site_id="au#2043/abc-kids-abc-tv-plus">ABC Kids / ABC TV Plus</channel>
     <channel lang="en" xmltv_id="ABCMe.au" site_id="au#2096/abc-me">ABC ME</channel>
-    <channel lang="en" xmltv_id="ABCNews.au" site_id="au#2149/abc-news">ABC News</channel>
+    <channel lang="en" xmltv_id="ABCNewsAustralia.au" site_id="au#2149/abc-news">ABC News</channel>
     <channel lang="en" xmltv_id="ABCTV.au" site_id="au#2984/abc-tv-hd">ABC TV</channel>
     <channel lang="en" xmltv_id="AustralianChristianChannel.au" site_id="au#3149/acc">Australian Christian Channel</channel>
     <channel lang="en" xmltv_id="ChannelNineSydney.au" site_id="au#2749/9-hd">Nine</channel>
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index 29f741eb..b4bd7ce0 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="en" xmltv_id="5USA.uk" site_id="3022">5 USA</channel>
     <channel lang="en" xmltv_id="5USAPlus1.uk" site_id="3027">5USA+1</channel>
     <channel lang="en" xmltv_id="92NewsHD.pk" site_id="3822">92 News</channel>
-    <channel lang="en" xmltv_id="A1TV.in" site_id="1104">A1 TV</channel>
+    <channel lang="en" xmltv_id="A1TVRajasthan.in" site_id="1104">A1 TV</channel>
     <channel lang="en" xmltv_id="AajTakUK.uk" site_id="3255">Aaj Tak UK</channel>
     <channel lang="en" xmltv_id="AasthaUK.uk" site_id="3594">Aastha UK</channel>
     <channel lang="en" xmltv_id="AdultChannel.uk" site_id="4195">Adult Channel</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 40ab1791..f6976079 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
@@ -5,7 +5,7 @@
     <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>
-    <channel lang="tr" xmltv_id="A2.tr" site_id="1861">A2</channel>
+    <channel lang="tr" xmltv_id="A2TV.tr" site_id="1861">A2</channel>
     <channel lang="tr" xmltv_id="AHaber.tr" site_id="366">A Haber</channel>
     <channel lang="tr" xmltv_id="AkitTV.tr" site_id="1775">Akit TV</channel>
     <channel lang="tr" xmltv_id="AlaToo24.kg" site_id="2043">Ala Too 24</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 767573db..d21673f2 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -549,7 +549,7 @@
     <channel lang="ru" xmltv_id="OstWest.de" site_id="922">Ost West</channel>
     <channel lang="en" xmltv_id="RTRPlaneta.ru" site_id="366">RTR Planeta</channel>
     <channel lang="ru" xmltv_id="TelebomTeledom.de" site_id="587">Telebom &amp; Teledom</channel>
-    <channel lang="sq" xmltv_id="ABCNews.al" site_id="1880">ABC News</channel>
+    <channel lang="sq" xmltv_id="ABCNewsAlbania.al" site_id="1880">ABC News</channel>
     <channel lang="sq" xmltv_id="EuronewsAlbania.al" site_id="1894">EuroNews Albania</channel>
     <channel lang="sq" xmltv_id="FaxNews.al" site_id="1895">Fax News</channel>
     <channel lang="sq" xmltv_id="FirstChannel.rs" site_id="1688">First Channel</channel>
diff --git a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
index c6abdb4b..3be24b69 100644
--- a/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
+++ b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
@@ -2,7 +2,7 @@
 <site site="tv.mail.ru">
   <channels>
     <channel lang="hy" xmltv_id="21TV.am" site_id="2785">21TV</channel>
-    <channel lang="hy" xmltv_id="5TV.am" site_id="2861">5TV</channel>
+    <channel lang="hy" xmltv_id="5TVArmenia.am" site_id="2861">5TV</channel>
     <channel lang="hy" xmltv_id="ArmeniaTV.am" site_id="2255">Armenia TV</channel>
     <channel lang="hy" xmltv_id="ATV.am" site_id="2944">ATV</channel>
     <channel lang="hy" xmltv_id="ATVBazmocTV.am" site_id="3010">ATV Bazmoc TV</channel>
@@ -11,7 +11,7 @@
     <channel lang="hy" xmltv_id="ATVKhaghaliqTV.am" site_id="2967">ATV Khaghaliq TV</channel>
     <channel lang="hy" xmltv_id="ATVKinoman.am" site_id="2968">ATV Kinoman</channel>
     <channel lang="hy" xmltv_id="ATVTavaTV.am" site_id="2953">ATV Tava TV</channel>
-    <channel lang="hy" xmltv_id="1TV.am" site_id="2995">H1</channel>
+    <channel lang="hy" xmltv_id="Armenia1.am" site_id="2995">H1</channel>
     <channel lang="hy" xmltv_id="KentronTV.am" site_id="2788">Kentron TV</channel>
     <channel lang="hy" xmltv_id="NorHayastanTV.am" site_id="2862">Nor Hayastan TV</channel>
     <channel lang="hy" xmltv_id="TBNArmenia.us" site_id="2969">TBN Armenia</channel>
diff --git a/sites/tv.mail.ru/tv.mail.ru_by.channels.xml b/sites/tv.mail.ru/tv.mail.ru_by.channels.xml
index b8435c9f..71bc7ccc 100644
--- a/sites/tv.mail.ru/tv.mail.ru_by.channels.xml
+++ b/sites/tv.mail.ru/tv.mail.ru_by.channels.xml
@@ -2,7 +2,7 @@
 <site site="tv.mail.ru">
   <channels>
     <channel lang="by" xmltv_id="BelsatTV.pl" site_id="2837">Belsat TV</channel>
-    <channel lang="ru" xmltv_id="8kanal.by" site_id="1717">8 kanal</channel>
+    <channel lang="ru" xmltv_id="Channel8Belarus.by" site_id="1717">8 kanal</channel>
     <channel lang="ru" xmltv_id="Belarus1.by" site_id="1294">Belarus 1</channel>
     <channel lang="ru" xmltv_id="Belarus2.by" site_id="1164">Belarus 2</channel>
     <channel lang="ru" xmltv_id="Belarus24.by" site_id="1385">Belarus 24</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 8618eca1..80904f35 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
@@ -4,7 +4,6 @@
     <channel lang="sl" xmltv_id="3sat.de" site_id="1000640">3sat</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>
     <channel lang="sl" xmltv_id="AlJazeeraBalkans.qa" site_id="1000180">Al Jazeera Balk</channel>
     <channel lang="sl" xmltv_id="Alsat.mk" site_id="1000219">Alsat-M</channel>
diff --git a/sites/tvgid.ua/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
index b362709f..34bc262e 100644
--- a/sites/tvgid.ua/tvgid.ua_ua.channels.xml
+++ b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
@@ -5,8 +5,8 @@
     <channel lang="uk" xmltv_id="24Kanal.ua" site_id="telekanal_novostej_24">24 Kanal</channel>
     <channel lang="uk" xmltv_id="2Plus2.ua" site_id="2plus2">2+2</channel>
     <channel lang="uk" xmltv_id="Channel34.ua" site_id="34kanal">34 Telekanal</channel>
-    <channel lang="uk" xmltv_id="5Kanal.ua" site_id="5kanal">5 Kanal</channel>
-    <channel lang="uk" xmltv_id="8Kanal.ua" site_id="8_kanal">8 Kanal</channel>
+    <channel lang="uk" xmltv_id="Channel5Ukraine.ua" site_id="5kanal">5 Kanal</channel>
+    <channel lang="uk" xmltv_id="Channel8Ukraine.ua" site_id="8_kanal">8 Kanal</channel>
     <channel lang="uk" xmltv_id="AjaraTV.ge" site_id="ajara_tv">Ajara TV</channel>
     <channel lang="uk" xmltv_id="AnimalPlanetRussia.ru" site_id="animal_planet">Animal Planet</channel>
     <channel lang="uk" xmltv_id="BBCWorldNewsEurope.uk" site_id="bbc_world">BBC World News</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 0b96861c..c8e00faa 100644
--- a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
+++ b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
@@ -4,7 +4,7 @@
     <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>
+    <channel lang="tr" xmltv_id="A2TV.tr" site_id="2">A2</channel>
     <channel lang="tr" xmltv_id="AdaTV.cy" site_id="67">Ada TV</channel>
     <channel lang="tr" xmltv_id="AHaber.tr" site_id="160">A Haber</channel>
     <channel lang="tr" xmltv_id="AkilliTV.tr" site_id="19">Akilli TV</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 14e8d9b6..ef6dfdc7 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="en" xmltv_id="AajTak.in" site_id="48512">Aaj Tak</channel>
     <channel lang="en" xmltv_id="AasthaBhajanUSA.us" site_id="71402">Aastha Bhajan</channel>
     <channel lang="en" xmltv_id="ABCEast.us" site_id="10003">ABC East</channel>
-    <channel lang="en" xmltv_id="ABCNews.us" site_id="113380">ABC News Live</channel>
+    <channel lang="en" xmltv_id="ABCNewsLive.us" site_id="113380">ABC News Live</channel>
     <channel lang="en" xmltv_id="ACCNetwork.us" site_id="111871">ACC Network</channel>
     <channel lang="en" xmltv_id="AccuWeather.us" site_id="56193">AccuWeather</channel>
     <channel lang="en" xmltv_id="ActionMaxEast.us" site_id="18433">ActionMax East</channel>