From f506dea0cbea7f704cc30753e02221cb662a70a4 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <github@oiya.xyz>
Date: Tue, 5 Apr 2022 21:07:37 +0300
Subject: [PATCH] Fixes validation issues

---
 .../astro.com.my/astro.com.my_my.channels.xml |  3 --
 .../beinsports.com_qa.channels.xml            | 44 ++++++++---------
 .../canalplus-caraibes.com_bl.channels.xml    | 10 ++--
 .../canalplus-caraibes.com_gf.channels.xml    | 10 ++--
 .../canalplus-caraibes.com_gp.channels.xml    | 10 ++--
 .../canalplus-caraibes.com_mf.channels.xml    | 10 ++--
 .../canalplus-caraibes.com_mq.channels.xml    | 10 ++--
 .../canalplus-reunion.com_km.channels.xml     |  6 +--
 .../canalplus-reunion.com_re.channels.xml     |  6 +--
 .../canalplus-reunion.com_yt.channels.xml     |  6 +--
 .../canalplus.com_fr.channels.xml             | 20 ++++----
 .../chaines-tv.orange.fr_fr.channels.xml      | 20 ++++----
 .../digiturk.com.tr_tr.channels.xml           | 48 +++++++++----------
 .../elcinema.com_eg-ar.channels.xml           | 12 ++---
 .../elcinema.com_eg-en.channels.xml           | 12 ++---
 sites/gatotv.com/gatotv.com_us.channels.xml   |  2 +-
 .../magentatv.de/magentatv.de_de.channels.xml |  4 +-
 .../mncvision.id_id-en.channels.xml           |  4 +-
 .../mncvision.id_id-id.channels.xml           |  4 +-
 .../nowplayer.now.com_hk-en.channels.xml      | 10 ++--
 .../nowplayer.now.com_hk-zh.channels.xml      | 10 ++--
 ...programacion-tv.elpais.com_es.channels.xml |  2 +-
 .../programme-tv.net_fr.channels.xml          | 20 ++++----
 .../telecablesat.fr_fr.channels.xml           | 20 ++++----
 .../turksatkablo.com.tr_tr.channels.xml       | 14 +++---
 .../tv.trueid.net_th.channels.xml             |  4 +-
 sites/tvtv.us/tvtv.us_us.channels.xml         |  8 ++--
 sites/vidio.com/vidio.com_id.channels.xml     |  6 +--
 sites/vivacom.bg/vivacom.bg_bg.channels.xml   |  2 +-
 29 files changed, 167 insertions(+), 170 deletions(-)

diff --git a/sites/astro.com.my/astro.com.my_my.channels.xml b/sites/astro.com.my/astro.com.my_my.channels.xml
index 5f019121..7152ebd6 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -52,9 +52,6 @@
     <channel lang="ms" xmltv_id="BBCFirstMalaysia.uk" site_id="458">BBC First Malaysia</channel>
     <channel lang="ms" xmltv_id="BBCLifestyleAsia.uk" site_id="451">BBC Lifestyle Asia</channel>
     <channel lang="ms" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="366">BBC World News Asia Pacific</channel>
-    <channel lang="ms" xmltv_id="BeInSports2MalaysiaSingapore.qa" site_id="466">BeIn Sports 2 Malaysia &amp; Singapore</channel>
-    <channel lang="ms" xmltv_id="BeInSportsMalaysiaSingapore.qa" site_id="236">BeIn Sports Malaysia &amp; Singapore</channel>
-    <channel lang="ms" xmltv_id="BeInSportsMaxMalaysiaSingapore.qa" site_id="313">BeIn Sports Max Malaysia &amp; Singapore</channel>
     <channel lang="ms" xmltv_id="BernamaTV.my" site_id="160">Bernama TV</channel>
     <channel lang="ms" xmltv_id="BloombergTVAsia.us" site_id="422">Bloomberg TV Asia</channel>
     <channel lang="ms" xmltv_id="Boo.my" site_id="251">Boo</channel>
diff --git a/sites/beinsports.com/beinsports.com_qa.channels.xml b/sites/beinsports.com/beinsports.com_qa.channels.xml
index 24911cc7..783fb749 100644
--- a/sites/beinsports.com/beinsports.com_qa.channels.xml
+++ b/sites/beinsports.com/beinsports.com_qa.channels.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="beinsports.com">
   <channels>
-    <channel lang="en" xmltv_id="BeInSports.qa" site_id="1">BeIn Sports</channel>
-    <channel lang="en" xmltv_id="BeInSportsNews.qa" site_id="2">BeIn Sports News</channel>
-    <channel lang="en" xmltv_id="BeInSports1.qa" site_id="3">BeIn Sports 1</channel>
-    <channel lang="en" xmltv_id="BeInSports2.qa" site_id="4">BeIn Sports 2</channel>
-    <channel lang="en" xmltv_id="BeInSports3.qa" site_id="5">BeIn Sports 3</channel>
-    <channel lang="en" xmltv_id="BeInSports4.qa" site_id="6">BeIn Sports 4</channel>
-    <channel lang="en" xmltv_id="BeInSports5.qa" site_id="7">BeIn Sports 5</channel>
-    <channel lang="en" xmltv_id="BeInSports6.qa" site_id="8">BeIn Sports 6</channel>
-    <channel lang="en" xmltv_id="BeInSports7.qa" site_id="9">BeIn Sports 7</channel>
-    <channel lang="en" xmltv_id="BeInSportsPremium1.qa" site_id="10">BeIn Sports Premium 1</channel>
-    <channel lang="en" xmltv_id="BeInSportsPremium2.qa" site_id="11">BeIn Sports Premium 2</channel>
-    <channel lang="en" xmltv_id="BeInSportsPremium3.qa" site_id="12">BeIn Sports Premium 3</channel>
-    <channel lang="en" xmltv_id="BeInSportsXtra1.qa" site_id="13">BeIn Sports Xtra 1</channel>
-    <channel lang="en" xmltv_id="BeInSportsXtra2.qa" site_id="14">BeIn Sports Xtra 2</channel>
-    <channel lang="en" xmltv_id="BeIn4K.qa" site_id="15">BeIn 4K</channel>
-    <channel lang="en" xmltv_id="BeInNBA.qa" site_id="16">BeIn NBA</channel>
-    <channel lang="en" xmltv_id="BeInSportsEnglish1.qa" site_id="17">BeIn Sports English 1</channel>
-    <channel lang="en" xmltv_id="BeInSportsEnglish2.qa" site_id="18">BeIn Sports English 2</channel>
-    <channel lang="en" xmltv_id="BeInSportsEnglish3.qa" site_id="19">BeIn Sports English 3</channel>
-    <channel lang="en" xmltv_id="BeInSportsFrench1.qa" site_id="20">BeIn Sports French 1</channel>
-    <channel lang="en" xmltv_id="BeInSportsFrench2.qa" site_id="21">BeIn Sports French 2</channel>
-    <channel lang="en" xmltv_id="BeInSportsFrench3.qa" site_id="22">BeIn Sports French 3</channel>
+    <channel lang="en" xmltv_id="BeINSports.qa" site_id="1">BeIn Sports</channel>
+    <channel lang="en" xmltv_id="BeINSportsNews.qa" site_id="2">BeIn Sports News</channel>
+    <channel lang="en" xmltv_id="BeINSports1.qa" site_id="3">BeIn Sports 1</channel>
+    <channel lang="en" xmltv_id="BeINSports2.qa" site_id="4">BeIn Sports 2</channel>
+    <channel lang="en" xmltv_id="BeINSports3.qa" site_id="5">BeIn Sports 3</channel>
+    <channel lang="en" xmltv_id="BeINSports4.qa" site_id="6">BeIn Sports 4</channel>
+    <channel lang="en" xmltv_id="BeINSports5.qa" site_id="7">BeIn Sports 5</channel>
+    <channel lang="en" xmltv_id="BeINSports6.qa" site_id="8">BeIn Sports 6</channel>
+    <channel lang="en" xmltv_id="BeINSports7.qa" site_id="9">BeIn Sports 7</channel>
+    <channel lang="en" xmltv_id="BeINSportsPremium1.qa" site_id="10">BeIn Sports Premium 1</channel>
+    <channel lang="en" xmltv_id="BeINSportsPremium2.qa" site_id="11">BeIn Sports Premium 2</channel>
+    <channel lang="en" xmltv_id="BeINSportsPremium3.qa" site_id="12">BeIn Sports Premium 3</channel>
+    <channel lang="en" xmltv_id="BeINSportsXtra1.qa" site_id="13">BeIn Sports Xtra 1</channel>
+    <channel lang="en" xmltv_id="BeINSportsXtra2.qa" site_id="14">BeIn Sports Xtra 2</channel>
+    <channel lang="en" xmltv_id="BeIN4K.qa" site_id="15">BeIn 4K</channel>
+    <channel lang="en" xmltv_id="BeINSportsNBA.qa" site_id="16">BeIn NBA</channel>
+    <channel lang="en" xmltv_id="BeINSportsEnglish1.qa" site_id="17">BeIn Sports English 1</channel>
+    <channel lang="en" xmltv_id="BeINSportsEnglish2.qa" site_id="18">BeIn Sports English 2</channel>
+    <channel lang="en" xmltv_id="BeINSportsEnglish3.qa" site_id="19">BeIn Sports English 3</channel>
+    <channel lang="en" xmltv_id="BeINSportsFrench1.qa" site_id="20">BeIn Sports French 1</channel>
+    <channel lang="en" xmltv_id="BeINSportsFrench2.qa" site_id="21">BeIn Sports French 2</channel>
+    <channel lang="en" xmltv_id="BeINSportsFrench3.qa" site_id="22">BeIn Sports French 3</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml b/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
index aaee195e..91ce4e81 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
@@ -10,11 +10,11 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="50565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="50008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="50557">Bblack! Caribbean</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="50115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="50243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="50347">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="50558">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="50559">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="50115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="50347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="50558">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="50559">BeIn Sports Max 5 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="50120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="50176">Canal 10</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="50011">Canal J</channel>
diff --git a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
index aaee195e..91ce4e81 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
@@ -10,11 +10,11 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="50565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="50008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="50557">Bblack! Caribbean</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="50115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="50243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="50347">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="50558">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="50559">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="50115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="50347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="50558">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="50559">BeIn Sports Max 5 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="50120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="50176">Canal 10</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="50011">Canal J</channel>
diff --git a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
index aaee195e..91ce4e81 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
@@ -10,11 +10,11 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="50565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="50008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="50557">Bblack! Caribbean</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="50115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="50243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="50347">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="50558">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="50559">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="50115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="50347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="50558">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="50559">BeIn Sports Max 5 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="50120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="50176">Canal 10</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="50011">Canal J</channel>
diff --git a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
index aaee195e..91ce4e81 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
@@ -10,11 +10,11 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="50565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="50008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="50557">Bblack! Caribbean</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="50115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="50243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="50347">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="50558">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="50559">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="50115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="50347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="50558">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="50559">BeIn Sports Max 5 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="50120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="50176">Canal 10</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="50011">Canal J</channel>
diff --git a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
index aaee195e..91ce4e81 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
@@ -10,11 +10,11 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="50565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="50008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="50557">Bblack! Caribbean</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="50115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="50243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="50347">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="50558">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="50559">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="50115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="50347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="50558">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="50559">BeIn Sports Max 5 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="50120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="50176">Canal 10</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="50011">Canal J</channel>
diff --git a/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml b/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml
index 9c2c8212..ea077f0c 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml
@@ -9,9 +9,9 @@
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="60007">ARTE Français</channel>
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="60565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAfrica.uk" site_id="60008">BBC World News Africa</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="60115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="60243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="60347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="60115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="60243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="60347">BeIn Sports 3 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="60120">C8</channel>
     <channel lang="fr" xmltv_id="CanalPlusCinemaReunion.fr" site_id="60014">Canal + Cinéma Réunion</channel>
     <channel lang="fr" xmltv_id="CanalPlusDecale.fr" site_id="60709">Canal + Décalé</channel>
diff --git a/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml b/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml
index 9c2c8212..ea077f0c 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml
@@ -9,9 +9,9 @@
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="60007">ARTE Français</channel>
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="60565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAfrica.uk" site_id="60008">BBC World News Africa</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="60115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="60243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="60347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="60115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="60243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="60347">BeIn Sports 3 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="60120">C8</channel>
     <channel lang="fr" xmltv_id="CanalPlusCinemaReunion.fr" site_id="60014">Canal + Cinéma Réunion</channel>
     <channel lang="fr" xmltv_id="CanalPlusDecale.fr" site_id="60709">Canal + Décalé</channel>
diff --git a/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml b/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml
index 9c2c8212..ea077f0c 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml
@@ -9,9 +9,9 @@
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="60007">ARTE Français</channel>
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="60565">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsAfrica.uk" site_id="60008">BBC World News Africa</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="60115">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="60243">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="60347">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="60115">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="60243">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="60347">BeIn Sports 3 France</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="60120">C8</channel>
     <channel lang="fr" xmltv_id="CanalPlusCinemaReunion.fr" site_id="60014">Canal + Cinéma Réunion</channel>
     <channel lang="fr" xmltv_id="CanalPlusDecale.fr" site_id="60709">Canal + Décalé</channel>
diff --git a/sites/canalplus.com/canalplus.com_fr.channels.xml b/sites/canalplus.com/canalplus.com_fr.channels.xml
index c5009165..608a19f8 100644
--- a/sites/canalplus.com/canalplus.com_fr.channels.xml
+++ b/sites/canalplus.com/canalplus.com_fr.channels.xml
@@ -13,16 +13,16 @@
     <channel lang="fr" xmltv_id="AstrocenterTV.fr" site_id="632">ASTROCENTER TV</channel>
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="612">AUTOMOTO LA CHAINE</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsEurope.uk" site_id="589">BBC WORLD NEWS</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="381">BEIN SPORTS 1</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="384">BEIN SPORTS 2</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="516">BEIN SPORTS 3</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax10France.qa" site_id="605">BEIN SPORTS MAX 10</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="596">BEIN SPORTS MAX 4</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="597">BEIN SPORTS MAX 5</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax6France.qa" site_id="598">BEIN SPORTS MAX 6</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax7France.qa" site_id="599">BEIN SPORTS MAX 7</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax8France.qa" site_id="603">BEIN SPORTS MAX 8</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax9France.qa" site_id="604">BEIN SPORTS MAX 9</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="381">BEIN SPORTS 1</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="384">BEIN SPORTS 2</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="516">BEIN SPORTS 3</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax10France.fr" site_id="605">BEIN SPORTS MAX 10</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="596">BEIN SPORTS MAX 4</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="597">BEIN SPORTS MAX 5</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax6France.fr" site_id="598">BEIN SPORTS MAX 6</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax7France.fr" site_id="599">BEIN SPORTS MAX 7</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax8France.fr" site_id="603">BEIN SPORTS MAX 8</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax9France.fr" site_id="604">BEIN SPORTS MAX 9</channel>
     <channel lang="fr" xmltv_id="BETFrance.us" site_id="628">BET</channel>
     <channel lang="fr" xmltv_id="BFMBusiness.fr" site_id="645">BFM BUSINESS</channel>
     <channel lang="fr" xmltv_id="BFMTV.fr" site_id="633">BFM TV</channel>
diff --git a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
index c5114abd..295f8f08 100644
--- a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
+++ b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml
@@ -14,16 +14,16 @@
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="15">Automoto la chaîne</channel>
     <channel lang="fr" xmltv_id="BBCEntertainmentEurope.uk" site_id="18">BBC Entertainment Europe</channel>
     <channel lang="fr" xmltv_id="BBCWorldNewsEurope.uk" site_id="19">BBC World News Europe</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="1290">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="1304">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="1335">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="1336">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="1337">BeIn Sports Max 5 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax6France.qa" site_id="1338">BeIn Sports Max 6 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax7France.qa" site_id="1339">BeIn Sports Max 7 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax8France.qa" site_id="1340">BeIn Sports Max 8 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax9France.qa" site_id="1341">BeIn Sports Max 9 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax10France.qa" site_id="1342">BeIn Sports Max 10 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="1290">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="1304">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="1335">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="1336">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="1337">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax6France.fr" site_id="1338">BeIn Sports Max 6 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax7France.fr" site_id="1339">BeIn Sports Max 7 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax8France.fr" site_id="1340">BeIn Sports Max 8 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax9France.fr" site_id="1341">BeIn Sports Max 9 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax10France.fr" site_id="1342">BeIn Sports Max 10 France</channel>
     <channel lang="fr" xmltv_id="BETFrance.us" site_id="1960">BET France</channel>
     <channel lang="fr" xmltv_id="BFMBusiness.fr" site_id="1073">BFM Business</channel>
     <channel lang="fr" xmltv_id="BFMTV.fr" site_id="481">BFM TV</channel>
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 bab8f9a8..23449f49 100644
--- a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
+++ b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
@@ -14,30 +14,30 @@
     <channel lang="tr" xmltv_id="BBCEntertainmentEurope.uk" site_id="88">BBC Entertainment Europe</channel>
     <channel lang="tr" xmltv_id="BBCFirstTurkey.uk" site_id="459">BBC First Türkiye</channel>
     <channel lang="tr" xmltv_id="BBCWorldNewsEurope.uk" site_id="77">BBC World News Europe</channel>
-    <channel lang="tr" xmltv_id="BeInBoxOffice1Turkey.qa" site_id="36">BeIn Box Office 1 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInBoxOffice2Turkey.qa" site_id="37">BeIn Box Office 2 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInBoxOffice3Turkey.qa" site_id="38">BeIn Box Office 3 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInGurme.qa" site_id="407">BeIn Gurme</channel>
-    <channel lang="tr" xmltv_id="BeInHE.qa" site_id="456">BeIn H&amp;E</channel>
-    <channel lang="tr" xmltv_id="BeInIz.qa" site_id="299">BeIn Iz</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesAction.qa" site_id="453">BeIn Movies Action</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesAction2.qa" site_id="454">BeIn Movies Action 2</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesFamily.qa" site_id="335">BeIn Movies Family</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesPremiere1.qa" site_id="271">BeIn Movies Premiere</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesPremiere2.qa" site_id="327">BeIn Movies Premiere 2</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesStars.qa" site_id="272">BeIn Movies Stars</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesTurk.qa" site_id="381">BeIn Movies Turk</channel>
-    <channel lang="tr" xmltv_id="BeInSeriesComedy.qa" site_id="326">BeIn Series Comedy</channel>
-    <channel lang="tr" xmltv_id="BeInSeriesDrama.qa" site_id="263">BeIn Series Drama</channel>
-    <channel lang="tr" xmltv_id="BeInSeriesSciFi.qa" site_id="375">BeIn Series Sci-Fi</channel>
-    <channel lang="tr" xmltv_id="BeInSeriesVice.qa" site_id="255">BeIn Series Vice</channel>
-    <channel lang="tr" xmltv_id="BeInSports1Turkey.qa" site_id="193">BeIn Sports 1 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports2Turkey.qa" site_id="310">BeIn Sports 2 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports3Turkey.qa" site_id="312">BeIn Sports 3 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports4Turkey.qa" site_id="495">BeIn Sports 4 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSportsHaber.qa" site_id="508">BeIn Sports Haber</channel>
-    <channel lang="tr" xmltv_id="BeInSportsMax1Turkey.qa" site_id="506">BeIn Sports Max 1 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSportsMax2Turkey.qa" site_id="507">BeIn Sports Max 2 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINBoxOffice1Turkey.tr" site_id="36">BeIn Box Office 1 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINBoxOffice2Turkey.tr" site_id="37">BeIn Box Office 2 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINBoxOffice3Turkey.tr" site_id="38">BeIn Box Office 3 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINGurme.tr" site_id="407">BeIn Gurme</channel>
+    <channel lang="tr" xmltv_id="BeINHE.tr" site_id="456">BeIn H&amp;E</channel>
+    <channel lang="tr" xmltv_id="BeINIZ.tr" site_id="299">BeIn Iz</channel>
+    <channel lang="tr" xmltv_id="BeINMovies2HD.qa" site_id="453">BeIn Movies Action</channel>
+    <channel lang="tr" xmltv_id="BeINMoviesAction2Turkey.tr" site_id="454">BeIn Movies Action 2</channel>
+    <channel lang="tr" xmltv_id="BeINMovies4HD.qa" site_id="335">BeIn Movies Family</channel>
+    <channel lang="tr" xmltv_id="BeINMovies1HD.qa" site_id="271">BeIn Movies Premiere</channel>
+    <channel lang="tr" xmltv_id="BeINMoviesPremiere2Turkey.tr" site_id="327">BeIn Movies Premiere 2</channel>
+    <channel lang="tr" xmltv_id="BeINMoviesStarsTurkey.tr" site_id="272">BeIn Movies Stars</channel>
+    <channel lang="tr" xmltv_id="BeINMoviesTurk.tr" site_id="381">BeIn Movies Turk</channel>
+    <channel lang="tr" xmltv_id="BeINSeriesComedyTurkey.tr" site_id="326">BeIn Series Comedy</channel>
+    <channel lang="tr" xmltv_id="BeINSeriesDramaTurkey.tr" site_id="263">BeIn Series Drama</channel>
+    <channel lang="tr" xmltv_id="BeINSeriesSciFiTurkey.tr" site_id="375">BeIn Series Sci-Fi</channel>
+    <channel lang="tr" xmltv_id="BeINSeriesViceTurkey.tr" site_id="255">BeIn Series Vice</channel>
+    <channel lang="tr" xmltv_id="BeINSports1Turkey.tr" site_id="193">BeIn Sports 1 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports2Turkey.tr" site_id="310">BeIn Sports 2 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports3Turkey.tr" site_id="312">BeIn Sports 3 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports4Turkey.tr" site_id="495">BeIn Sports 4 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSportsHaber.tr" site_id="508">BeIn Sports Haber</channel>
+    <channel lang="tr" xmltv_id="BeINSportsMax1Turkey.tr" site_id="506">BeIn Sports Max 1 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSportsMax2Turkey.tr" site_id="507">BeIn Sports Max 2 Türkiye</channel>
     <channel lang="tr" xmltv_id="BeyazTV.tr" site_id="188">Beyaz TV</channel>
     <channel lang="tr" xmltv_id="BloombergHT.us" site_id="24">Bloomberg HT</channel>
     <channel lang="tr" xmltv_id="BloombergTVEurope.us" site_id="137">Bloomberg TV Europe</channel>
diff --git a/sites/elcinema.com/elcinema.com_eg-ar.channels.xml b/sites/elcinema.com/elcinema.com_eg-ar.channels.xml
index 8f160d73..11eb4695 100644
--- a/sites/elcinema.com/elcinema.com_eg-ar.channels.xml
+++ b/sites/elcinema.com/elcinema.com_eg-ar.channels.xml
@@ -25,12 +25,12 @@
     <channel lang="ar" xmltv_id="ARTCinema.sa" site_id="1195">ART Cinema</channel>
     <channel lang="ar" xmltv_id="ARTHekayat.sa" site_id="1122">ART Hekayat</channel>
     <channel lang="ar" xmltv_id="ARTHekayat2.sa" site_id="1182">ART Hekayat 2</channel>
-    <channel lang="ar" xmltv_id="BeInDrama1.qa" site_id="1309">BeIn Drama 1</channel>
-    <channel lang="ar" xmltv_id="BeInMoviesAction.qa" site_id="1323">BeIn Movies Action</channel>
-    <channel lang="ar" xmltv_id="BeInMoviesFamily.qa" site_id="1325">BeIn Movies Family</channel>
-    <channel lang="ar" xmltv_id="BeInMoviesPremiere1.qa" site_id="1322">BeIn Movies Premiere</channel>
-    <channel lang="ar" xmltv_id="BeInSeries1.qa" site_id="1327">BeIn Series 1</channel>
-    <channel lang="ar" xmltv_id="BeInSeries2.qa" site_id="1328">BeIn Series 2</channel>
+    <channel lang="ar" xmltv_id="BeINDrama1HD.qa" site_id="1309">BeIn Drama 1</channel>
+    <channel lang="ar" xmltv_id="BeINMovies2HD.qa" site_id="1323">BeIn Movies Action</channel>
+    <channel lang="ar" xmltv_id="BeINMovies4HD.qa" site_id="1325">BeIn Movies Family</channel>
+    <channel lang="ar" xmltv_id="BeINMovies1HD.qa" site_id="1322">BeIn Movies Premiere</channel>
+    <channel lang="ar" xmltv_id="BeINSeries1.qa" site_id="1327">BeIn Series 1</channel>
+    <channel lang="ar" xmltv_id="BeINSeries2.qa" site_id="1328">BeIn Series 2</channel>
     <channel lang="ar" xmltv_id="CBC.eg" site_id="1198">CBC</channel>
     <channel lang="ar" xmltv_id="CBCDrama.eg" site_id="1199">CBC Drama</channel>
     <channel lang="ar" xmltv_id="CBCSofra.eg" site_id="1260">CBC Sofra</channel>
diff --git a/sites/elcinema.com/elcinema.com_eg-en.channels.xml b/sites/elcinema.com/elcinema.com_eg-en.channels.xml
index ed890d84..d8c9d94d 100644
--- a/sites/elcinema.com/elcinema.com_eg-en.channels.xml
+++ b/sites/elcinema.com/elcinema.com_eg-en.channels.xml
@@ -25,12 +25,12 @@
     <channel lang="en" xmltv_id="ARTCinema.sa" site_id="1195">ART Cinema</channel>
     <channel lang="en" xmltv_id="ARTHekayat.sa" site_id="1122">ART Hekayat</channel>
     <channel lang="en" xmltv_id="ARTHekayat2.sa" site_id="1182">ART Hekayat 2</channel>
-    <channel lang="en" xmltv_id="BeInDrama1.qa" site_id="1309">BeIn Drama 1</channel>
-    <channel lang="en" xmltv_id="BeInMoviesAction.qa" site_id="1323">BeIn Movies Action</channel>
-    <channel lang="en" xmltv_id="BeInMoviesFamily.qa" site_id="1325">BeIn Movies Family</channel>
-    <channel lang="en" xmltv_id="BeInMoviesPremiere1.qa" site_id="1322">BeIn Movies Premiere</channel>
-    <channel lang="en" xmltv_id="BeInSeries1.qa" site_id="1327">BeIn Series 1</channel>
-    <channel lang="en" xmltv_id="BeInSeries2.qa" site_id="1328">BeIn Series 2</channel>
+    <channel lang="en" xmltv_id="BeINDrama1HD.qa" site_id="1309">BeIn Drama 1</channel>
+    <channel lang="en" xmltv_id="BeINMovies2HD.qa" site_id="1323">BeIn Movies Action</channel>
+    <channel lang="en" xmltv_id="BeINMovies4HD.qa" site_id="1325">BeIn Movies Family</channel>
+    <channel lang="en" xmltv_id="BeINMovies1HD.qa" site_id="1322">BeIn Movies Premiere</channel>
+    <channel lang="en" xmltv_id="BeINSeries1.qa" site_id="1327">BeIn Series 1</channel>
+    <channel lang="en" xmltv_id="BeINSeries2.qa" site_id="1328">BeIn Series 2</channel>
     <channel lang="en" xmltv_id="CBC.eg" site_id="1198">CBC</channel>
     <channel lang="en" xmltv_id="CBCDrama.eg" site_id="1199">CBC Drama</channel>
     <channel lang="en" xmltv_id="CBCSofra.eg" site_id="1260">CBC Sofra</channel>
diff --git a/sites/gatotv.com/gatotv.com_us.channels.xml b/sites/gatotv.com/gatotv.com_us.channels.xml
index 11486971..a40e332f 100644
--- a/sites/gatotv.com/gatotv.com_us.channels.xml
+++ b/sites/gatotv.com/gatotv.com_us.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="BeInSportsenEspanol.qa" site_id="bein_sport_en_espanol">BeIn Sports en Español</channel>
+    <channel lang="es" xmltv_id="BeINSportsenEspanol.us" site_id="bein_sport_en_espanol">BeIn Sports en Español</channel>
     <channel lang="es" xmltv_id="CineSony.us" site_id="cine_sony">Cine Sony</channel>
     <channel lang="es" xmltv_id="ESPNDeportes.us" site_id="espn_deportes">ESPN Deportes</channel>
     <channel lang="es" xmltv_id="EstrellaTVEast.us" site_id="estrella_tv">Estrella TV East</channel>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index e40edfbe..3313ed14 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -19,8 +19,8 @@
     <channel lang="de" xmltv_id="BadenTVSud.de" site_id="3749">Baden TV Süd</channel>
     <channel lang="de" xmltv_id="BBCWorldNewsEurope.uk" site_id="454">BBC World</channel>
     <channel lang="de" xmltv_id="BeateUhseTV.de" site_id="107">Beate-Uhse.TV (Sky)</channel>
-    <channel lang="de" xmltv_id="BeInIz.qa" site_id="3826">beIN iZ</channel>
-    <channel lang="de" xmltv_id="BeInMoviesTurk.qa" site_id="440">beIN Movies Turk</channel>
+    <channel lang="de" xmltv_id="BeINIZ.tr" site_id="3826">beIN iZ</channel>
+    <channel lang="de" xmltv_id="BeINMoviesTurk.tr" site_id="440">beIN Movies Turk</channel>
     <channel lang="de" xmltv_id="Bergblick.de" site_id="45">Bergblick</channel>
     <channel lang="de" xmltv_id="BibelTV.de" site_id="485">Bibel TV</channel>
     <channel lang="de" xmltv_id="Bild.de" site_id="5077">BILD</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index c40e8a41..53d35f70 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -13,8 +13,8 @@
     <channel lang="en" xmltv_id="BabyTVAsia.uk" site_id="40">Baby TV Asia</channel>
     <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="200">BBC Earth Asia</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="332">BBC World News Asia Pacific</channel>
-    <channel lang="en" xmltv_id="BeInSports1Indonesia.qa" site_id="305">BeIn Sports 1 Indonesia</channel>
-    <channel lang="en" xmltv_id="BeInSports3Indonesia.qa" site_id="306">BeIn Sports 3 Indonesia</channel>
+    <channel lang="en" xmltv_id="BeINSports1Indonesia.id" site_id="305">BeIn Sports 1 Indonesia</channel>
+    <channel lang="en" xmltv_id="BeINSports3Indonesia.id" site_id="306">BeIn Sports 3 Indonesia</channel>
     <channel lang="en" xmltv_id="BeritaSatuNewsChannel.id" site_id="103">Berita Satu News Channel</channel>
     <channel lang="en" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
     <channel lang="en" xmltv_id="BloombergTVAsia.us" site_id="338">Bloomberg TV Asia</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index ddb766fc..ac51fd19 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -13,8 +13,8 @@
     <channel lang="id" xmltv_id="BabyTVAsia.uk" site_id="40">Baby TV Asia</channel>
     <channel lang="id" xmltv_id="BBCEarthAsia.uk" site_id="200">BBC Earth Asia</channel>
     <channel lang="id" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="332">BBC World News Asia Pacific</channel>
-    <channel lang="id" xmltv_id="BeInSports1Indonesia.qa" site_id="305">BeIn Sports 1 Indonesia</channel>
-    <channel lang="id" xmltv_id="BeInSports3Indonesia.qa" site_id="306">BeIn Sports 3 Indonesia</channel>
+    <channel lang="id" xmltv_id="BeINSports1Indonesia.id" site_id="305">BeIn Sports 1 Indonesia</channel>
+    <channel lang="id" xmltv_id="BeINSports3Indonesia.id" site_id="306">BeIn Sports 3 Indonesia</channel>
     <channel lang="id" xmltv_id="BeritaSatuNewsChannel.id" site_id="103">Berita Satu News Channel</channel>
     <channel lang="id" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
     <channel lang="id" xmltv_id="BloombergTVAsia.us" site_id="338">Bloomberg TV Asia</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
index ee92b1fb..1fd81826 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
@@ -11,11 +11,11 @@
     <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="220">BBC Earth Asia</channel>
     <channel lang="en" xmltv_id="BBCLifestyleAsia.uk" site_id="502">BBC Lifestyle Asia</channel>
     <channel lang="en" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="320">BBC World News Asia Pacific</channel>
-    <channel lang="en" xmltv_id="BeInSports1HongKong.qa" site_id="638">BeIn Sports 1 Hong Kong</channel>
-    <channel lang="en" xmltv_id="BeInSports2HongKong.qa" site_id="639">BeIn Sports 2 Hong Kong</channel>
-    <channel lang="en" xmltv_id="BeInSportsMax1.qa" site_id="643">BeIn Sports Max 1</channel>
-    <channel lang="en" xmltv_id="BeInSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
-    <channel lang="en" xmltv_id="BeInSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
+    <channel lang="en" xmltv_id="BeINSports1HongKong.hk" site_id="638">BeIn Sports 1 Hong Kong</channel>
+    <channel lang="en" xmltv_id="BeINSports2HongKong.hk" site_id="639">BeIn Sports 2 Hong Kong</channel>
+    <channel lang="en" xmltv_id="BeINSportsMax1.qa" site_id="643">BeIn Sports Max 1</channel>
+    <channel lang="en" xmltv_id="BeINSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
+    <channel lang="en" xmltv_id="BeINSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
     <channel lang="en" xmltv_id="BloombergTVAsia.us" site_id="321">Bloomberg TV Asia</channel>
     <channel lang="en" xmltv_id="BoomerangSouthEastAsia.us" site_id="445">Boomerang South East Asia</channel>
     <channel lang="en" xmltv_id="CartoonNetworkAsia.us" site_id="443">Cartoon Network Asia</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index 55a2c30e..d1ee028c 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
@@ -11,11 +11,11 @@
     <channel lang="zh" xmltv_id="BBCEarthAsia.uk" site_id="220">BBC Earth Asia</channel>
     <channel lang="zh" xmltv_id="BBCLifestyleAsia.uk" site_id="502">BBC Lifestyle Asia</channel>
     <channel lang="zh" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="320">BBC World News Asia Pacific</channel>
-    <channel lang="zh" xmltv_id="BeInSports1HongKong.qa" site_id="638">BeIn Sports 1 Hong Kong</channel>
-    <channel lang="zh" xmltv_id="BeInSports2HongKong.qa" site_id="639">BeIn Sports 2 Hong Kong</channel>
-    <channel lang="zh" xmltv_id="BeInSportsMax1.qa" site_id="643">BeIn Sports Max 1</channel>
-    <channel lang="zh" xmltv_id="BeInSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
-    <channel lang="zh" xmltv_id="BeInSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
+    <channel lang="zh" xmltv_id="BeINSports1HongKong.hk" site_id="638">BeIn Sports 1 Hong Kong</channel>
+    <channel lang="zh" xmltv_id="BeINSports2HongKong.hk" site_id="639">BeIn Sports 2 Hong Kong</channel>
+    <channel lang="zh" xmltv_id="BeINSportsMax1.qa" site_id="643">BeIn Sports Max 1</channel>
+    <channel lang="zh" xmltv_id="BeINSportsMax2.qa" site_id="644">BeIn Sports Max 2</channel>
+    <channel lang="zh" xmltv_id="BeINSportsMax3.qa" site_id="645">BeIn Sports Max 3</channel>
     <channel lang="zh" xmltv_id="BloombergTVAsia.us" site_id="321">Bloomberg TV Asia</channel>
     <channel lang="zh" xmltv_id="BoomerangSouthEastAsia.us" site_id="445">Boomerang South East Asia</channel>
     <channel lang="zh" xmltv_id="CartoonNetworkAsia.us" site_id="443">Cartoon Network Asia</channel>
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
index ed34e6a5..5b0d2442 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="es" xmltv_id="BabyTVLatinAmerica.uk" site_id="573">Baby TV Latin America</channel>
     <channel lang="es" xmltv_id="BarcaTV.es" site_id="155">Barça TV</channel>
     <channel lang="es" xmltv_id="BBCWorldNewsEurope.uk" site_id="208">BBC World News Europe</channel>
-    <channel lang="es" xmltv_id="BeInSportsenEspanol.qa" site_id="840">BeIn Sports en Español</channel>
+    <channel lang="es" xmltv_id="BeINSportsenEspanol.us" site_id="840">BeIn Sports en Español</channel>
     <channel lang="es" xmltv_id="BeMad.es" site_id="890">Be Mad</channel>
     <channel lang="es" xmltv_id="BlazeSpain.us" site_id="492">Blaze España</channel>
     <channel lang="es" xmltv_id="BoingSpain.it" site_id="665">Boing España</channel>
diff --git a/sites/programme-tv.net/programme-tv.net_fr.channels.xml b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
index c07a4369..18f94f02 100644
--- a/sites/programme-tv.net/programme-tv.net_fr.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
@@ -17,16 +17,16 @@
     <channel lang="fr" xmltv_id="BBCFour.uk" site_id="bbc4-247">BBC Four</channel>
     <channel lang="fr" xmltv_id="BBCOne.uk" site_id="bbc-1-230">BBC One</channel>
     <channel lang="fr" xmltv_id="BBCTwo.uk" site_id="bbc-2-231">BBC Two</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="bein-sports-1-183">BeIn Sports 1 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="bein-sports-2-184">BeIn Sports 2 France</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="bein-sports-3-265">BeIn Sports 3 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax10France.qa" site_id="bein-sports-max-10-305">BeIn Sports Max 10 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="bein-sports-max-4-300">BeIn Sports Max 4 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="bein-sports-max-5-301">BeIn Sports Max 5 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax6France.qa" site_id="bein-sports-max-6-302">BeIn Sports Max 6 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax7France.qa" site_id="bein-sports-max-7-303">BeIn Sports Max 7 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax8France.qa" site_id="bein-sports-max-8-304">BeIn Sports Max 8 France</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax9France.qa" site_id="bein-sports-max-9-306">BeIn Sports Max 9 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="bein-sports-1-183">BeIn Sports 1 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="bein-sports-2-184">BeIn Sports 2 France</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="bein-sports-3-265">BeIn Sports 3 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax10France.fr" site_id="bein-sports-max-10-305">BeIn Sports Max 10 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="bein-sports-max-4-300">BeIn Sports Max 4 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="bein-sports-max-5-301">BeIn Sports Max 5 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax6France.fr" site_id="bein-sports-max-6-302">BeIn Sports Max 6 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax7France.fr" site_id="bein-sports-max-7-303">BeIn Sports Max 7 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax8France.fr" site_id="bein-sports-max-8-304">BeIn Sports Max 8 France</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax9France.fr" site_id="bein-sports-max-9-306">BeIn Sports Max 9 France</channel>
     <channel lang="fr" xmltv_id="BETFrance.us" site_id="bet-299">BET France</channel>
     <channel lang="fr" xmltv_id="BFMBusiness.fr" site_id="bfm-business-232">BFM Business</channel>
     <channel lang="fr" xmltv_id="BFMLyon.fr" site_id="bfm-lyon-metropole-364">BFM Lyon</channel>
diff --git a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
index 6b9755da..be0dc346 100644
--- a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
+++ b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
@@ -24,16 +24,16 @@
     <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="19">BBC World News</channel>
     <channel lang="fr" xmltv_id="Be1.be" site_id="29">BE 1</channel>
     <channel lang="fr" xmltv_id="BeCine.be" site_id="417">Be Ciné</channel>
-    <channel lang="fr" xmltv_id="BeInSports1France.qa" site_id="1290">beIN SPORTS 1</channel>
-    <channel lang="fr" xmltv_id="BeInSports2France.qa" site_id="1304">beIN SPORTS 2</channel>
-    <channel lang="fr" xmltv_id="BeInSports3France.qa" site_id="1335">beIN SPORTS 3</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax10France.qa" site_id="1342">beIN SPORTS MAX 10</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax4France.qa" site_id="1336">beIN SPORTS MAX 4</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax5France.qa" site_id="1337">beIN SPORTS MAX 5</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax6France.qa" site_id="1338">beIN SPORTS MAX 6</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax7France.qa" site_id="1339">beIN SPORTS MAX 7</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax8France.qa" site_id="1340">beIN SPORTS MAX 8</channel>
-    <channel lang="fr" xmltv_id="BeInSportsMax9France.qa" site_id="1341">beIN SPORTS MAX 9</channel>
+    <channel lang="fr" xmltv_id="BeINSports1France.fr" site_id="1290">beIN SPORTS 1</channel>
+    <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="1304">beIN SPORTS 2</channel>
+    <channel lang="fr" xmltv_id="BeINSports3France.fr" site_id="1335">beIN SPORTS 3</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax10France.fr" site_id="1342">beIN SPORTS MAX 10</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax4France.fr" site_id="1336">beIN SPORTS MAX 4</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax5France.fr" site_id="1337">beIN SPORTS MAX 5</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax6France.fr" site_id="1338">beIN SPORTS MAX 6</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax7France.fr" site_id="1339">beIN SPORTS MAX 7</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax8France.fr" site_id="1340">beIN SPORTS MAX 8</channel>
+    <channel lang="fr" xmltv_id="BeINSportsMax9France.fr" site_id="1341">beIN SPORTS MAX 9</channel>
     <channel lang="fr" xmltv_id="BeSeries.be" site_id="418">Be Séries</channel>
     <channel lang="fr" xmltv_id="BETFrance.us" site_id="1960">BET</channel>
     <channel lang="fr" xmltv_id="BFMBusiness.fr" site_id="1073">BFM Business</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 d6a7a165..24216818 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
@@ -23,13 +23,13 @@
     <channel lang="tr" xmltv_id="BBCEntertainmentEurope.uk" site_id="170">BBC Entertainment Europe</channel>
     <channel lang="tr" xmltv_id="BBCWorldNewsEurope.uk" site_id="171">BBC World News Europe</channel>
     <channel lang="tr" xmltv_id="BBNTurk.tr" site_id="3671">BBN Türk</channel>
-    <channel lang="tr" xmltv_id="BeInSports1Turkey.qa" site_id="49">BeIn Sports 1 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports2Turkey.qa" site_id="381">BeIn Sports 2 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports3Turkey.qa" site_id="368">BeIn Sports 3 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSports4Turkey.qa" site_id="1946">BeIn Sports 4 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSportsHaber.qa" site_id="1871">BeIn Sports Haber</channel>
-    <channel lang="tr" xmltv_id="BeInSportsMax1Turkey.qa" site_id="1947">BeIn Sports Max 1 Türkiye</channel>
-    <channel lang="tr" xmltv_id="BeInSportsMax2Turkey.qa" site_id="1948">BeIn Sports Max 2 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports1Turkey.tr" site_id="49">BeIn Sports 1 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports2Turkey.tr" site_id="381">BeIn Sports 2 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports3Turkey.tr" site_id="368">BeIn Sports 3 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSports4Turkey.tr" site_id="1946">BeIn Sports 4 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSportsHaber.tr" site_id="1871">BeIn Sports Haber</channel>
+    <channel lang="tr" xmltv_id="BeINSportsMax1Turkey.tr" site_id="1947">BeIn Sports Max 1 Türkiye</channel>
+    <channel lang="tr" xmltv_id="BeINSportsMax2Turkey.tr" site_id="1948">BeIn Sports Max 2 Türkiye</channel>
     <channel lang="tr" xmltv_id="BenguTurk.tr" site_id="1915">Bengü Türk</channel>
     <channel lang="tr" xmltv_id="BeyazTV.tr" site_id="1410">Beyaz TV</channel>
     <channel lang="tr" xmltv_id="BeykentTV.tr" site_id="402">Beykent TV</channel>
diff --git a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
index 96322340..30d0c573 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -9,8 +9,8 @@
     <channel lang="th" xmltv_id="BBCLifestyleAsia.uk" site_id="bbc-life-style">BBC Lifestyle Asia</channel>
     <channel lang="th" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="bbc-world-news-hd">BBC World News Asia Pacific</channel>
     <channel lang="th" xmltv_id="BBTVChannel7.th" site_id="ch7-hd">BBTV Channel 7</channel>
-    <channel lang="th" xmltv_id="BeInSports1Thailand.qa" site_id="bein-sports-hd1">BeIn Sports 1 Thailand</channel>
-    <channel lang="th" xmltv_id="BeInSports2Thailand.qa" site_id="bein-sports-hd2">BeIn Sports 2 Thailand</channel>
+    <channel lang="th" xmltv_id="BeINSports1Thailand.th" site_id="bein-sports-hd1">BeIn Sports 1 Thailand</channel>
+    <channel lang="th" xmltv_id="BeINSports2Thailand.th" site_id="bein-sports-hd2">BeIn Sports 2 Thailand</channel>
     <channel lang="th" xmltv_id="CartoonNetworkAsia.us" site_id="hybrid-cartoon-network">Cartoon Network Asia</channel>
     <channel lang="th" xmltv_id="CCTV4Asia.cn" site_id="cctv">CCTV 4 Asia</channel>
     <channel lang="th" xmltv_id="Channel3.th" site_id="ch3-hd">Channel 3</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index ff1b3b1c..c853d239 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -14,7 +14,7 @@
     <channel lang="en" xmltv_id="AdultSwimWest.us" site_id="110135">[adult swim]West</channel>
     <channel lang="en" xmltv_id="AEEast.us" site_id="51529">A&amp;E East</channel>
     <channel lang="en" xmltv_id="AEWest.us" site_id="21760">A&amp;E West</channel>
-    <channel lang="en" xmltv_id="AlResalah.sa" site_id="31969">Al Resalah</channel>
+    <channel lang="en" xmltv_id="AlresalahTV.sa" site_id="31969">Al Resalah</channel>
     <channel lang="en" xmltv_id="AMCEast.us" site_id="10021">AMC East</channel>
     <channel lang="en" xmltv_id="AMCWest.us" site_id="31556">AMC West</channel>
     <channel lang="en" xmltv_id="AmericasAuctionChannel.us" site_id="50180">America's Auction Channel</channel>
@@ -68,8 +68,8 @@
     <channel lang="en" xmltv_id="BBCAmericaEast.uk" site_id="18332">BBC America East</channel>
     <channel lang="en" xmltv_id="BBCAmericaWest.uk" site_id="18339">BBC America West</channel>
     <channel lang="en" xmltv_id="BBCWorldNews.uk" site_id="89690">BBC World News (North America)</channel>
-    <channel lang="en" xmltv_id="BeInSportsenEspanol.qa" site_id="76943">BeIn Sports en Español</channel>
-    <channel lang="en" xmltv_id="BeInSportsUSA.qa" site_id="76942">BeIn Sports USA</channel>
+    <channel lang="en" xmltv_id="BeINSportsenEspanol.us" site_id="76943">BeIn Sports en Español</channel>
+    <channel lang="en" xmltv_id="BeINSportsUSA.us" site_id="76942">BeIn Sports USA</channel>
     <channel lang="en" xmltv_id="BETEast.us" site_id="10051">BET East</channel>
     <channel lang="en" xmltv_id="BETGospel.us" site_id="16484">BET Gospel</channel>
     <channel lang="en" xmltv_id="BETHerEast.us" site_id="14897">BET Her</channel>
@@ -1944,6 +1944,6 @@
     <channel lang="en" xmltv_id="WJLPDT3.us" site_id="99162">Grit (WJLP-DT3) New York, NY</channel>
     <channel lang="en" xmltv_id="WJLPDT4.us" site_id="99163">ION Mystery (WJLP-DT4) New York, NY</channel>
     <channel lang="en" xmltv_id="WJLPDT7.us" site_id="120389">Story Television (WJLP-DT7) New York, NY</channel>
-    <channel lang="en" xmltv_id="WJLPDT7.us" site_id="112951">MeTV Plus (WJLP-DT8) New York, NY</channel>
+    <channel lang="en" xmltv_id="WJLPDT8.us" site_id="112951">MeTV Plus (WJLP-DT8) New York, NY</channel>
   </channels>
 </site>
diff --git a/sites/vidio.com/vidio.com_id.channels.xml b/sites/vidio.com/vidio.com_id.channels.xml
index 17c254b9..46d9975b 100644
--- a/sites/vidio.com/vidio.com_id.channels.xml
+++ b/sites/vidio.com/vidio.com_id.channels.xml
@@ -4,8 +4,8 @@
     <channel lang="id" xmltv_id="AjwaTV.id" site_id="7464">Ajwa TV</channel>
     <channel lang="id" xmltv_id="AlJazeeraEnglish.qa" site_id="6410">Aljazeera English</channel>
     <channel lang="id" xmltv_id="ArirangWorld.kr" site_id="6784">Arirang World</channel>
-    <channel lang="id" xmltv_id="BeInSports1Indonesia.qa" site_id="6299">BeIn Sports 1 Indonesia</channel>
-    <channel lang="id" xmltv_id="BeInSports3Indonesia.qa" site_id="6317">BeIn Sports 3 Indonesia</channel>
+    <channel lang="id" xmltv_id="BeINSports1Indonesia.id" site_id="6299">BeIn Sports 1 Indonesia</channel>
+    <channel lang="id" xmltv_id="BeINSports3Indonesia.id" site_id="6317">BeIn Sports 3 Indonesia</channel>
     <channel lang="id" xmltv_id="BeritaSatuHD.id" site_id="6165">Berita Satu HD</channel>
     <channel lang="id" xmltv_id="ChampionsTV1.id" site_id="6685">Champions TV 1</channel>
     <channel lang="id" xmltv_id="ChampionsTV2.id" site_id="6686">Champions TV 2</channel>
@@ -25,7 +25,7 @@
     <channel lang="id" xmltv_id="EuronewsEnglish.fr" site_id="6412">EuroNews English</channel>
     <channel lang="id" xmltv_id="FashionTVAsia.fr" site_id="6511">Fashion TV Asia</channel>
     <channel lang="id" xmltv_id="FashionTVLOriginal.fr" site_id="6507">Fashion TV L'Original</channel>
-    <channel lang="id" xmltv_id="FashionTVMidniteSecrets.fr" site_id="6504">Fashion TV Midnite Secret</channel>
+    <channel lang="id" xmltv_id="FashionTVMidnightSecrets.fr" site_id="6504">Fashion TV Midnite Secret</channel>
     <channel lang="id" xmltv_id="HipHipHoree.id" site_id="7052">Hip Hip Horee!</channel>
     <channel lang="id" xmltv_id="Horee.id" site_id="6397">Horee!</channel>
     <channel lang="id" xmltv_id="Indosiar.id" site_id="205">Indosiar</channel>
diff --git a/sites/vivacom.bg/vivacom.bg_bg.channels.xml b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
index 541acdaf..4227351e 100644
--- a/sites/vivacom.bg/vivacom.bg_bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
@@ -16,7 +16,7 @@
     <channel lang="en" xmltv_id="BabyTVEurope.uk" site_id="8#Baby TV">Baby TV Europe</channel>
     <channel lang="en" xmltv_id="BalkanikaMusicTV.bg" site_id="12#Балканика">Balkanika Music TV</channel>
     <channel lang="bg" xmltv_id="BarelyLegalTV.us" site_id="22#Barely Legal">Barely Legal TV</channel>
-    <channel lang="tr" xmltv_id="BeInMoviesTurk.qa" site_id="24#Bein Movies">BeIn Movies Turk</channel>
+    <channel lang="tr" xmltv_id="BeINMoviesTurk.tr" site_id="24#Bein Movies">BeIn Movies Turk</channel>
     <channel lang="bg" xmltv_id="BGMusicChannel.bg" site_id="13#BG Music Channel">BG Music Channel</channel>
     <channel lang="bg" xmltv_id="BloombergTVBulgaria.us" site_id="9#Bloomberg BG">Bloomberg TV Bulgaria</channel>
     <channel lang="bg" xmltv_id="BNT1.bg" site_id="17#БНТ 1">BNT 1</channel>