diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index b29ae464..593c9aa3 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="10000000053730000">Aljazeera English</channel>
     <channel lang="en" xmltv_id="AndPictures.in" site_id="10000000024300000">&amp; pictures</channel>
     <channel lang="en" xmltv_id="AndPriveHD.in" site_id="10000000053720000">&amp; privé HD</channel>
-    <channel lang="en" xmltv_id="TV.in" site_id="10000000028050000">&amp; TV</channel>
+    <channel lang="en" xmltv_id="AndTV.in" site_id="10000000028050000">&amp; TV</channel>
     <channel lang="en" xmltv_id="AnimalPlanetHDWorldIndia.in" site_id="10000000024790000">Animal Planet HD World India</channel>
     <channel lang="en" xmltv_id="AnimalPlanetIndia.in" site_id="10000000000320000">Animal Planet India</channel>
     <channel lang="en" xmltv_id="ArgusNews.in" site_id="10000000075992204">Argus News</channel>
diff --git a/sites/magticom.ge/magticom.ge.test.js b/sites/magticom.ge/magticom.ge.test.js
index a6bf72e1..8a016f5d 100644
--- a/sites/magticom.ge/magticom.ge.test.js
+++ b/sites/magticom.ge/magticom.ge.test.js
@@ -11,7 +11,7 @@ dayjs.extend(utc)
 const date = dayjs.utc('2021-11-22', 'YYYY-MM-DD').startOf('d')
 const channel = {
   site_id: '260',
-  xmltv_id: 'BollywoodTVRossiya.ru'
+  xmltv_id: 'BollywoodHD.ru'
 }
 
 it('can generate valid url', () => {
diff --git a/sites/magticom.ge/magticom.ge_ge.channels.xml b/sites/magticom.ge/magticom.ge_ge.channels.xml
index a94f3a59..7ec3b6c0 100644
--- a/sites/magticom.ge/magticom.ge_ge.channels.xml
+++ b/sites/magticom.ge/magticom.ge_ge.channels.xml
@@ -16,7 +16,7 @@
     <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>
-    <channel lang="ru" xmltv_id="BollywoodTVRossiya.ru" site_id="260">Bollywood TV Rossiya</channel>
+    <channel lang="ru" xmltv_id="BollywoodHD.ru" site_id="260">Bollywood TV Rossiya</channel>
     <channel lang="ka" xmltv_id="BrazzersTVEurope.us" site_id="206">Brazzers TV Europe</channel>
     <channel lang="ru" xmltv_id="CartoonNetworkRussia.ru" site_id="41">Cartoon Network Russia &amp; South East Europe</channel>
     <channel lang="ka" xmltv_id="ChveniMagti.ge" site_id="248">Chveni Magti</channel>
@@ -26,12 +26,12 @@
     <channel lang="ka" xmltv_id="ComedyTV.ge" site_id="58000">Comedy TV</channel>
     <channel lang="ka" xmltv_id="Dardimandi.ge" site_id="199">Dardimandi</channel>
     <channel lang="ru" xmltv_id="DaVinci.de" site_id="225">Da Vinci</channel>
-    <channel lang="ru" xmltv_id="DiscoveryScienceRossiya.us" site_id="46">Discovery Science Rossiya</channel>
+    <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="46">Discovery Science Rossiya</channel>
     <channel lang="ru" xmltv_id="DocuBoxHD.us" site_id="262">DocuBox HD</channel>
     <channel lang="ru" xmltv_id="Domashniy.ru" site_id="1336">Domashniy</channel>
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="185">Dom Kino</channel>
     <channel lang="ru" xmltv_id="DomKinoPremium.ru" site_id="269">Dom Kino Premium</channel>
-    <channel lang="ru" xmltv_id="DTXRossiya.us" site_id="45">DTX Rossiya</channel>
+    <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="45">DTX Rossiya</channel>
     <channel lang="ru" xmltv_id="DuckTVSD.sk" site_id="251">Duck TV SD</channel>
     <channel lang="ka" xmltv_id="EnkiBenki.ge" site_id="83">Enki Benki</channel>
     <channel lang="ka" xmltv_id="EroxHD.us" site_id="2">Erox HD</channel>
@@ -52,9 +52,9 @@
     <channel lang="ru" xmltv_id="HollywoodHD.ru" site_id="142">Hollywood HD</channel>
     <channel lang="ru" xmltv_id="IllusionPlus.ru" site_id="295">Illusion +</channel>
     <channel lang="ka" xmltv_id="ImediTV.ge" site_id="4">Imedi TV</channel>
-    <channel lang="ru" xmltv_id="InvestigationDiscoveryRossiya.ru" site_id="159">Investigation Discovery Rossiya</channel>
+    <channel lang="ru" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="159">Investigation Discovery Rossiya</channel>
     <channel lang="ru" xmltv_id="Istoriya.ru" site_id="261">Istoriya</channel>
-    <channel lang="ru" xmltv_id="JimJamRossiya.uk" site_id="283">JimJam Rossiya</channel>
+    <channel lang="ru" xmltv_id="JimJamRussia.uk" site_id="283">JimJam Rossiya</channel>
     <channel lang="ru" xmltv_id="KaruselInternational.ru" site_id="184">Karusel International</channel>
     <channel lang="ka" xmltv_id="KavkasiaTV.ge" site_id="135">Kavkasia TV</channel>
     <channel lang="ka" xmltv_id="Maestro.ge" site_id="141">Maestro</channel>
diff --git a/sites/startimestv.com/startimestv.com_bi.channels.xml b/sites/startimestv.com/startimestv.com_bi.channels.xml
index 57903916..97421b67 100644
--- a/sites/startimestv.com/startimestv.com_bi.channels.xml
+++ b/sites/startimestv.com/startimestv.com_bi.channels.xml
@@ -50,7 +50,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTNHome.ke" site_id="469">KTN</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
diff --git a/sites/startimestv.com/startimestv.com_cd.channels.xml b/sites/startimestv.com/startimestv.com_cd.channels.xml
index f30c8fdb..65d89931 100644
--- a/sites/startimestv.com/startimestv.com_cd.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cd.channels.xml
@@ -73,7 +73,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_cg.channels.xml b/sites/startimestv.com/startimestv.com_cg.channels.xml
index a11d678f..98df5a6e 100644
--- a/sites/startimestv.com/startimestv.com_cg.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cg.channels.xml
@@ -65,7 +65,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_ci.channels.xml b/sites/startimestv.com/startimestv.com_ci.channels.xml
index dd7c8263..070b443a 100644
--- a/sites/startimestv.com/startimestv.com_ci.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ci.channels.xml
@@ -76,7 +76,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_cm.channels.xml b/sites/startimestv.com/startimestv.com_cm.channels.xml
index 02357f3a..a76de042 100644
--- a/sites/startimestv.com/startimestv.com_cm.channels.xml
+++ b/sites/startimestv.com/startimestv.com_cm.channels.xml
@@ -60,7 +60,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="IsiMbido.ng" site_id="660">ISI MBIDO</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="M6Music.fr" site_id="431476009">M6 MUSIC</channel>
     <channel lang="en" xmltv_id="MSNBCInternational.us" site_id="154">MSNBC</channel>
diff --git a/sites/startimestv.com/startimestv.com_gh.channels.xml b/sites/startimestv.com/startimestv.com_gh.channels.xml
index e77f5a56..87e9d5e6 100644
--- a/sites/startimestv.com/startimestv.com_gh.channels.xml
+++ b/sites/startimestv.com/startimestv.com_gh.channels.xml
@@ -57,7 +57,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="JoyPrime.gh" site_id="679">JOY PRIME</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="M6Music.fr" site_id="431476009">M6 MUSIC</channel>
diff --git a/sites/startimestv.com/startimestv.com_gn.channels.xml b/sites/startimestv.com/startimestv.com_gn.channels.xml
index 53c09efa..c4097d91 100644
--- a/sites/startimestv.com/startimestv.com_gn.channels.xml
+++ b/sites/startimestv.com/startimestv.com_gn.channels.xml
@@ -67,7 +67,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_ke.channels.xml b/sites/startimestv.com/startimestv.com_ke.channels.xml
index 3480afc5..b6f126b0 100644
--- a/sites/startimestv.com/startimestv.com_ke.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ke.channels.xml
@@ -67,7 +67,7 @@
     <channel lang="en" xmltv_id="ITV.tz" site_id="191">ITV</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KassTV.ke" site_id="1283575051">KASS TV</channel>
     <channel lang="en" xmltv_id="KBCChannel1.ke" site_id="316">KBC</channel>
diff --git a/sites/startimestv.com/startimestv.com_mg.channels.xml b/sites/startimestv.com/startimestv.com_mg.channels.xml
index 5600cb93..cdd84733 100644
--- a/sites/startimestv.com/startimestv.com_mg.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mg.channels.xml
@@ -70,7 +70,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_mw.channels.xml b/sites/startimestv.com/startimestv.com_mw.channels.xml
index 62710580..9510e238 100644
--- a/sites/startimestv.com/startimestv.com_mw.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mw.channels.xml
@@ -38,7 +38,7 @@
     <channel lang="en" xmltv_id="GospelMusicTV.uk" site_id="275">Gospel Music TV</channel>
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTNHome.ke" site_id="469">KTN</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_ng.channels.xml b/sites/startimestv.com/startimestv.com_ng.channels.xml
index 2409e7dc..b79613c5 100644
--- a/sites/startimestv.com/startimestv.com_ng.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ng.channels.xml
@@ -63,7 +63,7 @@
     <channel lang="en" xmltv_id="IsiMbido.ng" site_id="660">ISI MBIDO</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="LibertyTV.ng" site_id="237">Liberty</channel>
     <channel lang="en" xmltv_id="M6Music.fr" site_id="431476009">M6 MUSIC</channel>
diff --git a/sites/startimestv.com/startimestv.com_rw.channels.xml b/sites/startimestv.com/startimestv.com_rw.channels.xml
index 471b1c3c..678b0321 100644
--- a/sites/startimestv.com/startimestv.com_rw.channels.xml
+++ b/sites/startimestv.com/startimestv.com_rw.channels.xml
@@ -56,7 +56,7 @@
     <channel lang="en" xmltv_id="GospelMusicTV.uk" site_id="275">Gospel Music TV</channel>
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="KTNHome.ke" site_id="469">KTN</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
     <channel lang="en" xmltv_id="KissTV.uk" site_id="385">KISS</channel>
diff --git a/sites/startimestv.com/startimestv.com_tz.channels.xml b/sites/startimestv.com/startimestv.com_tz.channels.xml
index 3e5768b2..92770fa5 100644
--- a/sites/startimestv.com/startimestv.com_tz.channels.xml
+++ b/sites/startimestv.com/startimestv.com_tz.channels.xml
@@ -70,7 +70,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="K24.ke" site_id="468">K24</channel>
     <channel lang="en" xmltv_id="KTNHome.ke" site_id="469">KTN</channel>
     <channel lang="en" xmltv_id="KTO.fr" site_id="576">KTO</channel>
diff --git a/sites/startimestv.com/startimestv.com_ug.channels.xml b/sites/startimestv.com/startimestv.com_ug.channels.xml
index c9f0083f..c7c7d6ef 100644
--- a/sites/startimestv.com/startimestv.com_ug.channels.xml
+++ b/sites/startimestv.com/startimestv.com_ug.channels.xml
@@ -62,7 +62,7 @@
     <channel lang="en" xmltv_id="IqraaAfricaEurope.sa" site_id="203">IQRAA</channel>
     <channel lang="en" xmltv_id="JiangsuTV.cn" site_id="405">浙江卫视</channel>
     <channel lang="en" xmltv_id="JiangsuTVInternational.cn" site_id="418">江苏卫视</channel>
-    <channel lang="en" xmltv_id="JimJamRossiya.uk" site_id="127">JIMJAM</channel>
+    <channel lang="en" xmltv_id="JimJamRussia.uk" site_id="127">JIMJAM</channel>
     <channel lang="en" xmltv_id="KBCChannel1.ke" site_id="316">KBC</channel>
     <channel lang="en" xmltv_id="KBSTV.ug" site_id="1673125626">KBS TV</channel>
     <channel lang="en" xmltv_id="KOTV.ca" site_id="314">KOTV</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index 7dcbb53d..357ec34a 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="AMCRussia.us" site_id="829">AMC Russia</channel>
-    <channel lang="en" xmltv_id="AnimalPlanetRossiya.ru" site_id="31">Animal Planet Rossiya</channel>
+    <channel lang="en" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
     <channel lang="en" xmltv_id="ARTEFrench.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>
@@ -17,13 +17,13 @@
     <channel lang="en" xmltv_id="CMusicTV.uk" site_id="155">C Music TV</channel>
     <channel lang="en" xmltv_id="CNBCEurope.uk" site_id="82">CNBC Europe</channel>
     <channel lang="en" xmltv_id="CNNInternationalEurope.us" site_id="50">CNN International Europe</channel>
-    <channel lang="en" xmltv_id="DiscoveryChannelRossiya.ru" site_id="26">Discovery Channel Rossiya</channel>
-    <channel lang="en" xmltv_id="DiscoveryScienceRossiya.us" site_id="33">Discovery Science Rossiya</channel>
+    <channel lang="en" xmltv_id="DiscoveryChannelRussia.ru" site_id="26">Discovery Channel Rossiya</channel>
+    <channel lang="en" xmltv_id="DiscoveryScienceRussia.ru" site_id="33">Discovery Science Rossiya</channel>
     <channel lang="en" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
     <channel lang="en" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
     <channel lang="en" xmltv_id="DomKinoInternational.ru" site_id="95">Dom Kino International</channel>
     <channel lang="en" xmltv_id="Dozhd.ru" site_id="828">Dozhd</channel>
-    <channel lang="en" xmltv_id="DTXRossiya.us" site_id="217">DTX Rossiya</channel>
+    <channel lang="en" xmltv_id="DTXRussia.ru" site_id="217">DTX Rossiya</channel>
     <channel lang="en" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV SD</channel>
     <channel lang="en" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="en" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
@@ -40,7 +40,7 @@
     <channel lang="en" xmltv_id="ETVPlus.ee" site_id="1252">ETV +</channel>
     <channel lang="en" xmltv_id="Eurochannel.us" site_id="1241">Eurochannel</channel>
     <channel lang="en" xmltv_id="EuronewsRusskiy.fr" site_id="59">EuroNews Russkiy</channel>
-    <channel lang="en" xmltv_id="Eurosport1Rossiya.ru" site_id="35">Eurosport 1 Rossiya</channel>
+    <channel lang="en" xmltv_id="Eurosport1Russia.ru" site_id="35">Eurosport 1 Rossiya</channel>
     <channel lang="en" xmltv_id="FashionTVRussia.ru" site_id="54">FashionTV Russia</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
     <channel lang="en" xmltv_id="Filmzone.ee" site_id="1238">Filmzone</channel>
@@ -54,7 +54,7 @@
     <channel lang="en" xmltv_id="HistoryRussia.ru" site_id="251">History Russia</channel>
     <channel lang="en" xmltv_id="HustlerTVEurope.us" site_id="90">Hustler TV Europe</channel>
     <channel lang="en" xmltv_id="Inspira.ee" site_id="1338">Inspira</channel>
-    <channel lang="en" xmltv_id="InvestigationDiscoveryRossiya.ru" site_id="32">Investigation Discovery Rossiya</channel>
+    <channel lang="en" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery Rossiya</channel>
     <channel lang="en" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="en" xmltv_id="KaruselInternational.ru" site_id="75">Karusel International</channel>
     <channel lang="en" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index 0aac9081..9d53477e 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="AMCRussia.us" site_id="829">AMC Russia</channel>
-    <channel lang="et" xmltv_id="AnimalPlanetRossiya.ru" site_id="31">Animal Planet Rossiya</channel>
+    <channel lang="et" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
     <channel lang="et" xmltv_id="ARTEFrench.fr" site_id="24">ARTE Français</channel>
     <channel lang="et" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="et" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News Europe</channel>
@@ -17,13 +17,13 @@
     <channel lang="et" xmltv_id="CMusicTV.uk" site_id="155">C Music TV</channel>
     <channel lang="et" xmltv_id="CNBCEurope.uk" site_id="82">CNBC Europe</channel>
     <channel lang="et" xmltv_id="CNNInternationalEurope.us" site_id="50">CNN International Europe</channel>
-    <channel lang="et" xmltv_id="DiscoveryChannelRossiya.ru" site_id="26">Discovery Channel Rossiya</channel>
-    <channel lang="et" xmltv_id="DiscoveryScienceRossiya.us" site_id="33">Discovery Science Rossiya</channel>
+    <channel lang="et" xmltv_id="DiscoveryChannelRussia.ru" site_id="26">Discovery Channel Rossiya</channel>
+    <channel lang="et" xmltv_id="DiscoveryScienceRussia.ru" site_id="33">Discovery Science Rossiya</channel>
     <channel lang="et" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
     <channel lang="et" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
     <channel lang="et" xmltv_id="DomKinoInternational.ru" site_id="95">Dom Kino International</channel>
     <channel lang="et" xmltv_id="Dozhd.ru" site_id="828">Dozhd</channel>
-    <channel lang="et" xmltv_id="DTXRossiya.us" site_id="217">DTX Rossiya</channel>
+    <channel lang="et" xmltv_id="DTXRussia.ru" site_id="217">DTX Rossiya</channel>
     <channel lang="et" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV SD</channel>
     <channel lang="et" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="et" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
@@ -40,7 +40,7 @@
     <channel lang="et" xmltv_id="ETVPlus.ee" site_id="1252">ETV +</channel>
     <channel lang="et" xmltv_id="Eurochannel.us" site_id="1241">Eurochannel</channel>
     <channel lang="et" xmltv_id="EuronewsRusskiy.fr" site_id="59">EuroNews Russkiy</channel>
-    <channel lang="et" xmltv_id="Eurosport1Rossiya.ru" site_id="35">Eurosport 1 Rossiya</channel>
+    <channel lang="et" xmltv_id="Eurosport1Russia.ru" site_id="35">Eurosport 1 Rossiya</channel>
     <channel lang="et" xmltv_id="FashionTVRussia.ru" site_id="54">FashionTV Russia</channel>
     <channel lang="et" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
     <channel lang="et" xmltv_id="Filmzone.ee" site_id="1238">Filmzone</channel>
@@ -54,7 +54,7 @@
     <channel lang="et" xmltv_id="HistoryRussia.ru" site_id="251">History Russia</channel>
     <channel lang="et" xmltv_id="HustlerTVEurope.us" site_id="90">Hustler TV Europe</channel>
     <channel lang="et" xmltv_id="Inspira.ee" site_id="1338">Inspira</channel>
-    <channel lang="et" xmltv_id="InvestigationDiscoveryRossiya.ru" site_id="32">Investigation Discovery Rossiya</channel>
+    <channel lang="et" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery Rossiya</channel>
     <channel lang="et" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="et" xmltv_id="KaruselInternational.ru" site_id="75">Karusel International</channel>
     <channel lang="et" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index 1018fa8e..7694fb60 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="ru" 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="AMCRussia.us" site_id="829">AMC Russia</channel>
-    <channel lang="ru" xmltv_id="AnimalPlanetRossiya.ru" site_id="31">Animal Planet Rossiya</channel>
+    <channel lang="ru" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
     <channel lang="ru" xmltv_id="ARTEFrench.fr" site_id="24">ARTE Français</channel>
     <channel lang="ru" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
     <channel lang="ru" xmltv_id="BBCWorldNewsEurope.uk" site_id="52">BBC World News Europe</channel>
@@ -17,13 +17,13 @@
     <channel lang="ru" xmltv_id="CMusicTV.uk" site_id="155">C Music TV</channel>
     <channel lang="ru" xmltv_id="CNBCEurope.uk" site_id="82">CNBC Europe</channel>
     <channel lang="ru" xmltv_id="CNNInternationalEurope.us" site_id="50">CNN International Europe</channel>
-    <channel lang="ru" xmltv_id="DiscoveryChannelRossiya.ru" site_id="26">Discovery Channel Rossiya</channel>
-    <channel lang="ru" xmltv_id="DiscoveryScienceRossiya.us" site_id="33">Discovery Science Rossiya</channel>
+    <channel lang="ru" xmltv_id="DiscoveryChannelRussia.ru" site_id="26">Discovery Channel Rossiya</channel>
+    <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="33">Discovery Science Rossiya</channel>
     <channel lang="ru" xmltv_id="DisneyChannelScandinavia.uk" site_id="102">Disney Channel Scandinavia</channel>
     <channel lang="ru" xmltv_id="DisneyJuniorScandinavia.uk" site_id="103">Disney Junior Scandinavia</channel>
     <channel lang="ru" xmltv_id="DomKinoInternational.ru" site_id="95">Dom Kino International</channel>
     <channel lang="ru" xmltv_id="Dozhd.ru" site_id="828">Dozhd</channel>
-    <channel lang="ru" xmltv_id="DTXRossiya.us" site_id="217">DTX Rossiya</channel>
+    <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="217">DTX Rossiya</channel>
     <channel lang="ru" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV SD</channel>
     <channel lang="ru" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="ru" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
@@ -40,7 +40,7 @@
     <channel lang="ru" xmltv_id="ETVPlus.ee" site_id="1252">ETV +</channel>
     <channel lang="ru" xmltv_id="Eurochannel.us" site_id="1241">Eurochannel</channel>
     <channel lang="ru" xmltv_id="EuronewsRusskiy.fr" site_id="59">EuroNews Russkiy</channel>
-    <channel lang="ru" xmltv_id="Eurosport1Rossiya.ru" site_id="35">Eurosport 1 Rossiya</channel>
+    <channel lang="ru" xmltv_id="Eurosport1Russia.ru" site_id="35">Eurosport 1 Rossiya</channel>
     <channel lang="ru" xmltv_id="FashionTVRussia.ru" site_id="54">FashionTV Russia</channel>
     <channel lang="ru" xmltv_id="FightSports.us" site_id="1268">Fight Sports</channel>
     <channel lang="ru" xmltv_id="Filmzone.ee" site_id="1238">Filmzone</channel>
@@ -54,7 +54,7 @@
     <channel lang="ru" xmltv_id="HistoryRussia.ru" site_id="251">History Russia</channel>
     <channel lang="ru" xmltv_id="HustlerTVEurope.us" site_id="90">Hustler TV Europe</channel>
     <channel lang="ru" xmltv_id="Inspira.ee" site_id="1338">Inspira</channel>
-    <channel lang="ru" xmltv_id="InvestigationDiscoveryRossiya.ru" site_id="32">Investigation Discovery Rossiya</channel>
+    <channel lang="ru" xmltv_id="InvestigationDiscoveryRussia.ru" site_id="32">Investigation Discovery Rossiya</channel>
     <channel lang="ru" xmltv_id="Kanal2.ee" site_id="3">Kanal 2</channel>
     <channel lang="ru" xmltv_id="KaruselInternational.ru" site_id="75">Karusel International</channel>
     <channel lang="ru" xmltv_id="KidzonePlus.ee" site_id="1293">Kidzone+</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
index 4b8e4101..fbdad817 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -14,7 +14,7 @@
     <channel lang="ru" xmltv_id="AmediaHit.ru" site_id="213#amedia-hit-239">Amedia Hit</channel>
     <channel lang="ru" xmltv_id="AmediaPremium.ru" site_id="213#amedia-premium-hd-238">Amedia Premium</channel>
     <channel lang="ru" xmltv_id="AnekdotTV.ru" site_id="213#anekdot-tv-85">Anekdot TV</channel>
-    <channel lang="ru" xmltv_id="AnimalPlanetRossiya.ru" site_id="213#animal-planet-22">Animal Planet Rossiya</channel>
+    <channel lang="ru" xmltv_id="AnimalPlanetRussia.ru" site_id="213#animal-planet-22">Animal Planet Rossiya</channel>
     <channel lang="ru" xmltv_id="Arkhyz24.ru" site_id="213#arhyz-24-111">Arkhyz 24</channel>
     <channel lang="ru" xmltv_id="AutoPlus.ru" site_id="213#avto-plyus-436">Auto Plus</channel>
     <channel lang="ru" xmltv_id="BBCEntertainmentEurope.uk" site_id="213#bbc-entertainment-479">BBC Entertainment Europe</channel>
@@ -39,8 +39,8 @@
     <channel lang="ru" xmltv_id="CNNInternationalEurope.us" site_id="213#cnn-570">CNN International Europe</channel>
     <channel lang="ru" xmltv_id="DaVinci.de" site_id="213#da-vinci-525">Da Vinci</channel>
     <channel lang="ru" xmltv_id="DiscoveryChannelEast.us" site_id="213#discovery-vostochnaya-evropa-740">Discovery Channel East</channel>
-    <channel lang="ru" xmltv_id="DiscoveryChannelRossiya.ru" site_id="213#discovery-channel-21">Discovery Channel Rossiya</channel>
-    <channel lang="ru" xmltv_id="DiscoveryScienceRossiya.us" site_id="213#discovery-science-524">Discovery Science Rossiya</channel>
+    <channel lang="ru" xmltv_id="DiscoveryChannelRussia.ru" site_id="213#discovery-channel-21">Discovery Channel Rossiya</channel>
+    <channel lang="ru" xmltv_id="DiscoveryScienceRussia.ru" site_id="213#discovery-science-524">Discovery Science Rossiya</channel>
     <channel lang="ru" xmltv_id="DocuBoxHD.us" site_id="213#docubox-hd-1227">DocuBox HD</channel>
     <channel lang="ru" xmltv_id="DomashnieZhivotnye.ru" site_id="213#domashnie-jivotnye-578">Domashnie Zhivotnye</channel>
     <channel lang="ru" xmltv_id="Domashniy.ru" site_id="213#domashniy-5">Domashniy</channel>
@@ -48,15 +48,15 @@
     <channel lang="ru" xmltv_id="DomKinoPremium.ru" site_id="213#dom-kino-premium-1213">Dom Kino Premium</channel>
     <channel lang="ru" xmltv_id="Dozhd.ru" site_id="213#dojd-101">Dozhd</channel>
     <channel lang="ru" xmltv_id="Draiv.ru" site_id="213#drayv-573">Draiv</channel>
-    <channel lang="ru" xmltv_id="DTXRossiya.us" site_id="213#dtx-1146">DTX Rossiya</channel>
+    <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="213#dtx-1146">DTX Rossiya</channel>
     <channel lang="ru" xmltv_id="DWEnglish.de" site_id="213#deutsche-welle-122">DW English</channel>
     <channel lang="ru" xmltv_id="Eda.ru" site_id="213#eda-64">Eda</channel>
     <channel lang="ru" xmltv_id="EdaPremium.ru" site_id="213#eda-premium-742">Eda Premium</channel>
     <channel lang="ru" xmltv_id="EnglishClubTV.uk" site_id="213#english-club-tv-683">English Club TV</channel>
     <channel lang="ru" xmltv_id="ETV.ru" site_id="213#e-tv-235">E TV</channel>
     <channel lang="ru" xmltv_id="EuropaPlusTV.ru" site_id="213#europa-plus-tv-656">Europa Plus TV</channel>
-    <channel lang="ru" xmltv_id="Eurosport1Rossiya.ru" site_id="213#eurosport-677">Eurosport 1 Rossiya</channel>
-    <channel lang="ru" xmltv_id="Eurosport2Rossiya.ru" site_id="213#eurosport-2-720">Eurosport 2 Rossiya</channel>
+    <channel lang="ru" xmltv_id="Eurosport1Russia.ru" site_id="213#eurosport-677">Eurosport 1 Rossiya</channel>
+    <channel lang="ru" xmltv_id="Eurosport2Russia.ru" site_id="213#eurosport-2-720">Eurosport 2 Rossiya</channel>
     <channel lang="ru" xmltv_id="Evrokino.ru" site_id="213#evrokino-505">Evrokino</channel>
     <channel lang="ru" xmltv_id="ExtremeSportsChannel.nl" site_id="213#extreme-sports-484">Extreme Sports Channel</channel>
     <channel lang="ru" xmltv_id="FashionBoxHD.us" site_id="213#fashion-box-hd-1242">FashionBox HD</channel>
@@ -80,7 +80,7 @@
     <channel lang="ru" xmltv_id="InsightUHD.nl" site_id="213#insight-ultra-hd-1172">Insight UHD</channel>
     <channel lang="ru" xmltv_id="Istoriya.ru" site_id="213#istoriya-794">Istoriya</channel>
     <channel lang="ru" xmltv_id="IzvestiaTV.ru" site_id="213#izvestiya-96">Izvestia TV</channel>
-    <channel lang="ru" xmltv_id="JimJamRossiya.uk" site_id="213#jimjam-569">JimJam Rossiya</channel>
+    <channel lang="ru" xmltv_id="JimJamRussia.uk" site_id="213#jimjam-569">JimJam Rossiya</channel>
     <channel lang="ru" xmltv_id="KaleidoskopTV.ru" site_id="213#kaleydoskop-tv-232">Kaleidoskop TV</channel>
     <channel lang="ru" xmltv_id="DisneyChannelRussia.ru" site_id="213#kanal-disney-4">Kanal Disney</channel>
     <channel lang="ru" xmltv_id="KapitanFantastika.ru" site_id="213#ginger-hd-1166">Kapitan Fantastika</channel>
diff --git a/sites/tvgid.ua/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
index 2ccbd197..cc40461c 100644
--- a/sites/tvgid.ua/tvgid.ua_ua.channels.xml
+++ b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
@@ -26,8 +26,8 @@
     <channel lang="uk" xmltv_id="EnterFilm.ua" site_id="enter_film">Enter Film</channel>
     <channel lang="uk" xmltv_id="EspresoTV.ua" site_id="espresso_tv">Espreso TV</channel>
     <channel lang="uk" xmltv_id="EuMusic.ua" site_id="eu_music">Eu Music</channel>
-    <channel lang="uk" xmltv_id="Eurosport1Rossiya.ru" site_id="eurosport_1_rossiya">Eurosport 1 Rossiya</channel>
-    <channel lang="uk" xmltv_id="Eurosport2Rossiya.ru" site_id="eurosport_2_rossiya">Eurosport 2 Rossiya</channel>
+    <channel lang="uk" xmltv_id="Eurosport1Russia.ru" site_id="eurosport_1_rossiya">Eurosport 1 Rossiya</channel>
+    <channel lang="uk" xmltv_id="Eurosport2Russia.ru" site_id="eurosport_2_rossiya">Eurosport 2 Rossiya</channel>
     <channel lang="uk" xmltv_id="Evrokino.ru" site_id="evrokino">Evrokino</channel>
     <channel lang="uk" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme_sport">Extreme Sports Channel</channel>
     <channel lang="uk" xmltv_id="FoxLifeRussia.ru" site_id="fox_life">Fox Life Russia</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_bg.channels.xml b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
index 147dd3fb..9f0680fe 100644
--- a/sites/tvprofil.com/tvprofil.com_bg.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
@@ -55,7 +55,7 @@
     <channel lang="hr" xmltv_id="VTK.bg" site_id="bg/tv-programa#vtk-bg">VTK</channel>
     <channel lang="hr" xmltv_id="WnessTV.bg" site_id="bg/tv-programa#wness-tv">Wness TV</channel>
     <channel lang="hr" xmltv_id="24KitchenBulgaria.bg" site_id="bg/tv-programa#24kitchen-bg">24 Kitchen Bulgaria</channel>
-    <channel lang="hr" xmltv_id="AnimalPlanetRossiya.ru" site_id="bg/tv-programa#animal-planet-ru">Animal Planet Rossiya</channel>
+    <channel lang="hr" xmltv_id="AnimalPlanetRussia.ru" site_id="bg/tv-programa#animal-planet-ru">Animal Planet Rossiya</channel>
     <channel lang="hr" xmltv_id="AXNBlack.us" site_id="bg/tv-programa#axn-black-bg">AXN Black</channel>
     <channel lang="hr" xmltv_id="AXNBulgaria.bg" site_id="bg/tv-programa#axn-bg">AXN Bulgaria</channel>
     <channel lang="hr" xmltv_id="AXNWhite.us" site_id="bg/tv-programa#axn-white-bg">AXN White</channel>