From 6a4c180ebfa8af57a0e5756676ffdbb57b218c49 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Thu, 23 Nov 2023 14:15:04 +0300
Subject: [PATCH] Fixes xmltv_id

---
 sites/bt.com/bt.com.channels.xml                      |  4 ++--
 sites/dishtv.in/dishtv.in.channels.xml                |  2 +-
 sites/entertainment.ie/entertainment.ie.channels.xml  |  6 +++---
 sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml            |  4 ++--
 sites/meo.pt/meo.pt.channels.xml                      |  2 +-
 sites/ontvtonight.com/ontvtonight.com_uk.channels.xml |  4 ++--
 sites/programme-tv.net/programme-tv.net.channels.xml  |  2 +-
 sites/proximusmwc.be/proximusmwc.be.channels.xml      |  2 +-
 sites/sky.com/sky.com.channels.xml                    | 10 +++++-----
 sites/telecablesat.fr/telecablesat.fr.channels.xml    |  2 +-
 sites/telenet.tv/telenet.tv.channels.xml              |  2 +-
 sites/tv.blue.ch/tv.blue.ch.channels.xml              |  4 ++--
 sites/tv24.co.uk/tv24.co.uk.channels.xml              |  2 +-
 sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml        |  2 +-
 sites/tvprofil.com/tvprofil.com.channels.xml          |  2 +-
 sites/virginmedia.com/virginmedia.com.channels.xml    |  6 +++---
 sites/webtv.delta.nl/webtv.delta.nl.channels.xml      |  2 +-
 sites/ziggogo.tv/ziggogo.tv.channels.xml              |  4 ++--
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/sites/bt.com/bt.com.channels.xml b/sites/bt.com/bt.com.channels.xml
index 6608267c..92f1d544 100644
--- a/sites/bt.com/bt.com.channels.xml
+++ b/sites/bt.com/bt.com.channels.xml
@@ -14,7 +14,7 @@
   <channel site="bt.com" lang="en" xmltv_id="BBCOneCambridgeshire.uk" site_id="hs56">BBC One Cambridgeshire</channel>
   <channel site="bt.com" lang="en" xmltv_id="BBCOneChannelIslands.uk" site_id="hs5y">BBC One Channel Islands</channel>
   <channel site="bt.com" lang="en" xmltv_id="BBCOneEastMidlands.uk" site_id="hs6h">BBC One East Midlands</channel>
-  <channel site="bt.com" lang="en" xmltv_id="BBCOneEngland.uk" site_id="hsxv">BBC One HD</channel>
+  <channel site="bt.com" lang="en" xmltv_id="BBCOne.uk" site_id="hsxv">BBC One HD</channel>
   <channel site="bt.com" lang="en" xmltv_id="BBCOneLondon.uk" site_id="hs44">BBC One London</channel>
   <channel site="bt.com" lang="en" xmltv_id="BBCOneNorthEastCumbria.uk" site_id="hs2t">BBC One North East &amp; Cumbria</channel>
   <channel site="bt.com" lang="en" xmltv_id="BBCOneNorthWest.uk" site_id="hs5k">BBC One North West</channel>
@@ -94,7 +94,7 @@
   <channel site="bt.com" lang="en" xmltv_id="Now80s.uk" site_id="hsxf">Now 80&apos;s</channel>
   <channel site="bt.com" lang="en" xmltv_id="Now90s.uk" site_id="hs8t">Now 90&apos;s</channel>
   <channel site="bt.com" lang="en" xmltv_id="PBSAmerica.uk" site_id="hsxm">PBS America</channel>
-  <channel site="bt.com" lang="en" xmltv_id="Pick.uk" site_id="hst7">Pick UK</channel>
+  <channel site="bt.com" lang="en" xmltv_id="SkyMix.uk" site_id="hst7">Pick UK</channel>
   <channel site="bt.com" lang="en" xmltv_id="Pop.uk" site_id="hsyg">Pop</channel>
   <channel site="bt.com" lang="en" xmltv_id="PopMax.uk" site_id="hs8x">Pop Max</channel>
   <channel site="bt.com" lang="en" xmltv_id="QuestRed.uk" site_id="hsv7">Quest Red UK</channel>
diff --git a/sites/dishtv.in/dishtv.in.channels.xml b/sites/dishtv.in/dishtv.in.channels.xml
index 22f93099..22bf2b2f 100644
--- a/sites/dishtv.in/dishtv.in.channels.xml
+++ b/sites/dishtv.in/dishtv.in.channels.xml
@@ -311,7 +311,7 @@
   <channel site="dishtv.in" lang="en" xmltv_id="SonyMax2.in" site_id="10000000022850000">SONY MAX 2</channel>
   <channel site="dishtv.in" lang="en" xmltv_id="SonyPal.in" site_id="10000000025050000">SONY PAL</channel>
   <channel site="dishtv.in" lang="en" xmltv_id="SonyPix.in" site_id="10000000000550000">SONY PIX</channel>
-  <channel site="dishtv.in" lang="en" xmltv_id="SonySABIndia.in" site_id="10000000000560000">SONY SAB</channel>
+  <channel site="dishtv.in" lang="en" xmltv_id="SonySAB.in" site_id="10000000000560000">SONY SAB</channel>
   <channel site="dishtv.in" lang="en" xmltv_id="SonySportsTen1.in" site_id="10000000000620000">SONY SPORTS TEN 1</channel>
   <channel site="dishtv.in" lang="en" xmltv_id="SonySportsTen2.in" site_id="10000000000240000">SONY SPORTS TEN 2</channel>
   <channel site="dishtv.in" lang="en" xmltv_id="SonySportsTen3.in" site_id="10000000006000000">SONY SPORTS TEN 3</channel>
diff --git a/sites/entertainment.ie/entertainment.ie.channels.xml b/sites/entertainment.ie/entertainment.ie.channels.xml
index dadf21ae..093ba90f 100644
--- a/sites/entertainment.ie/entertainment.ie.channels.xml
+++ b/sites/entertainment.ie/entertainment.ie.channels.xml
@@ -57,9 +57,9 @@
   <channel site="entertainment.ie" lang="en" xmltv_id="NationalGeographicWild.uk" site_id="national-geographic-wild">National Geographic Wild</channel>
   <channel site="entertainment.ie" lang="en" xmltv_id="Nickelodeon.uk" site_id="nickelodeon">Nickelodeon</channel>
   <channel site="entertainment.ie" lang="en" xmltv_id="Nicktoons.uk" site_id="nicktoons">Nicktoons</channel>
-  <channel site="entertainment.ie" lang="en" xmltv_id="Pick.uk" site_id="pick">Pick</channel>
-  <channel site="entertainment.ie" lang="en" xmltv_id="PremierSports1Ireland.ie" site_id="premier-sports-1">Premier Sports 1</channel>
-  <channel site="entertainment.ie" lang="en" xmltv_id="PremierSports2Ireland.ie" site_id="premier-sports-2">Premier Sports 2</channel>
+  <channel site="entertainment.ie" lang="en" xmltv_id="SkyMix.uk" site_id="pick">Pick</channel>
+  <channel site="entertainment.ie" lang="en" xmltv_id="PremierSports1.ie" site_id="premier-sports-1">Premier Sports 1</channel>
+  <channel site="entertainment.ie" lang="en" xmltv_id="PremierSports2.ie" site_id="premier-sports-2">Premier Sports 2</channel>
   <channel site="entertainment.ie" lang="en" xmltv_id="Quest.uk" site_id="quest">Quest</channel>
   <channel site="entertainment.ie" lang="en" xmltv_id="RealityXtra.uk" site_id="reality-xtra">Reality Xtra</channel>
   <channel site="entertainment.ie" lang="en" xmltv_id="Really.uk" site_id="really">Really</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index 14a0d73f..6a05b5b9 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -878,7 +878,7 @@
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCEntertainment.uk" site_id="BBC+Entertainment">BBC Entertainment</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCFour.uk" site_id="BBC+Four">BBC Four</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="BBC+World+News">BBC World News</channel>
-  <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCOneEngland.uk" site_id="BBC+One">BBC One</channel>
+  <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCOne.uk" site_id="BBC+One">BBC One</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BBCTwo.uk" site_id="BBC+Two">BBC Two</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BloombergTVEurope.uk" site_id="Bloomberg">Bloomberg</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="BlueHustler.nl" site_id="Blue+Hustler">Blue Hustler</channel>
@@ -940,7 +940,7 @@
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="NHKWorldJapan.jp" site_id="NHK+World+TV">NHK World TV</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="OutdoorChannel.us" site_id="Outdoor+Channel">Outdoor Channel</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="PassionXXX.nl" site_id="Passion+XXX">Passion XXX</channel>
-  <channel site="m.tv.sms.cz" lang="en" xmltv_id="Pick.uk" site_id="Pick+TV">Pick TV</channel>
+  <channel site="m.tv.sms.cz" lang="en" xmltv_id="SkyMix.uk" site_id="Pick+TV">Pick TV</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="PlayboyTVEurope.us" site_id="Playboy+TV">Playboy TV</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="RealityKingsTV.us" site_id="Reality+Kings+TV">Reality Kings TV</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="RTGTV.ru" site_id="Russian+Travel+Guide">Russian Travel Guide</channel>
diff --git a/sites/meo.pt/meo.pt.channels.xml b/sites/meo.pt/meo.pt.channels.xml
index b8edcd96..99c51ce4 100644
--- a/sites/meo.pt/meo.pt.channels.xml
+++ b/sites/meo.pt/meo.pt.channels.xml
@@ -181,7 +181,7 @@
   <channel site="meo.pt" lang="pt" xmltv_id="SICMulher.pt" site_id="SICM">SIC Mulher</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="SICNoticias.pt" site_id="SICN">SIC Notícias</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="SICRadical.pt" site_id="SICR">SIC Radical</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="SonyEntertainmentTelevisionAsia.uk" site_id="SETAS">SET ASIA</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="SETAS">SET ASIA</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="SonyMaxUK.uk" site_id="MAX">SET MAX</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="SPlus.pt" site_id="SMAISHD">S+</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="StarCinema.ua" site_id="STARCIN">Star Cinema</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
index 2aa59d8d..9ed9c20f 100644
--- a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
@@ -12,7 +12,7 @@
   <channel site="ontvtonight.com" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="uk#69035251/al-jazeera-english">Aljazeera English</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="BBCFour.uk" site_id="uk#69035379/bbc-four">BBC Four</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="BBCNews.uk" site_id="uk#69035345/bbc-news">BBC News</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="BBCOneEngland.uk" site_id="uk#69038686/bbc-1-hdtv">BBC One</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="BBCOne.uk" site_id="uk#69038686/bbc-1-hdtv">BBC One</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="BBCOneLondon.uk" site_id="uk#69035334/bbc-1-london">BBC One London</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="BBCOneScotland.uk" site_id="uk#69035339/bbc-1-scotland">BBC One Scotland</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="BBCParliament.uk" site_id="uk#69035446/bbc-parliament">BBC Parliament</channel>
@@ -70,7 +70,7 @@
   <channel site="ontvtonight.com" lang="en" xmltv_id="More4.uk" site_id="uk#69036330/more4">More 4 UK</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="Now80s.uk" site_id="uk#804653420/now-80s">Now 80&apos;s</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="PBSAmerica.uk" site_id="uk#69044017/pbs-america">PBS America</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="Pick.uk" site_id="uk#69036986/pick-tv">Pick UK</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="SkyMix.uk" site_id="uk#69036986/pick-tv">Pick UK</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="Pop.uk" site_id="uk#69040588/pop">Pop</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="QuestRed.uk" site_id="uk#4606690382/quest-red">Quest Red UK</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="QuestRedPlus1.uk" site_id="uk#4645499309/quest-red1">Quest Red UK +1</channel>
diff --git a/sites/programme-tv.net/programme-tv.net.channels.xml b/sites/programme-tv.net/programme-tv.net.channels.xml
index 21684ff9..e86ce7c5 100644
--- a/sites/programme-tv.net/programme-tv.net.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net.channels.xml
@@ -15,7 +15,7 @@
   <channel site="programme-tv.net" lang="fr" xmltv_id="BabyTV.uk" site_id="baby-tv-229">Baby TV Europe</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="BBCEntertainment.uk" site_id="bbc-entertainment-194">BBC Entertainment Europe</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="BBCFour.uk" site_id="bbc4-247">BBC Four</channel>
-  <channel site="programme-tv.net" lang="fr" xmltv_id="BBCOneEngland.uk" site_id="bbc-1-230">BBC One</channel>
+  <channel site="programme-tv.net" lang="fr" xmltv_id="BBCOne.uk" site_id="bbc-1-230">BBC One</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="BBCTwo.uk" site_id="bbc-2-231">BBC Two</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="beINSports1.fr" site_id="bein-sports-1-183">BeIn Sports 1 France</channel>
   <channel site="programme-tv.net" lang="fr" xmltv_id="beINSports2.fr" site_id="bein-sports-2-184">BeIn Sports 2 France</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be.channels.xml b/sites/proximusmwc.be/proximusmwc.be.channels.xml
index 9b054d3a..90cc5967 100644
--- a/sites/proximusmwc.be/proximusmwc.be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be.channels.xml
@@ -6,7 +6,7 @@
   <channel site="proximusmwc.be" lang="de" xmltv_id="ZDF.de" site_id="UID0030">ZDF</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="BBCEntertainment.uk" site_id="UID50316">BBC Ent</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="BBCFirstBenelux.uk" site_id="UID0132">BBC First</channel>
-  <channel site="proximusmwc.be" lang="en" xmltv_id="BBCOneEngland.uk" site_id="UID50071">BBC One</channel>
+  <channel site="proximusmwc.be" lang="en" xmltv_id="BBCOne.uk" site_id="UID50071">BBC One</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="BBCTwo.uk" site_id="UID50295">BBC Two</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="UID50069">BBC World</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="UID50032">CNN</channel>
diff --git a/sites/sky.com/sky.com.channels.xml b/sites/sky.com/sky.com.channels.xml
index 60dc15bc..fe9d74ea 100644
--- a/sites/sky.com/sky.com.channels.xml
+++ b/sites/sky.com/sky.com.channels.xml
@@ -77,7 +77,7 @@
   <channel site="sky.com" lang="en" xmltv_id="BBCNews.uk" site_id="2011">BBC News</channel>
   <channel site="sky.com" lang="en" xmltv_id="BBCOneChannelIslands.uk" site_id="2074">BBC One CI</channel>
   <channel site="sky.com" lang="en" xmltv_id="BBCOneEastMidlands.uk" site_id="2105">BBC One E Mid</channel>
-  <channel site="sky.com" lang="en" xmltv_id="BBCOneEngland.uk" site_id="2076">BBC One</channel>
+  <channel site="sky.com" lang="en" xmltv_id="BBCOne.uk" site_id="2076">BBC One</channel>
   <channel site="sky.com" lang="en" xmltv_id="BBCOneLondon.uk" site_id="1059">BBC One Lon</channel>
   <channel site="sky.com" lang="en" xmltv_id="BBCOneNorthEastCumbria.uk" site_id="2155">BBC One NE&amp;C</channel>
   <channel site="sky.com" lang="en" xmltv_id="BBCOneNorthernIreland.uk" site_id="2005">BBC One NI</channel>
@@ -254,14 +254,14 @@
   <channel site="sky.com" lang="en" xmltv_id="Now90s.uk" site_id="3682">Now 90&apos;s</channel>
   <channel site="sky.com" lang="en" xmltv_id="OireachtasTV.ie" site_id="1257">Oireachtas TV</channel>
   <channel site="sky.com" lang="en" xmltv_id="PBSAmerica.uk" site_id="5500">PBS America</channel>
-  <channel site="sky.com" lang="en" xmltv_id="Pick.uk" site_id="1832">Pick UK</channel>
+  <channel site="sky.com" lang="en" xmltv_id="SkyMix.uk" site_id="1832">Pick UK</channel>
   <channel site="sky.com" lang="en" xmltv_id="Pitaara.in" site_id="1260">Pitaara</channel>
   <channel site="sky.com" lang="en" xmltv_id="Pop.uk" site_id="3750">Pop</channel>
   <channel site="sky.com" lang="en" xmltv_id="PopMax.uk" site_id="4262">Pop Max</channel>
   <channel site="sky.com" lang="en" xmltv_id="PopMaxPlus1.uk" site_id="4263">POP Max+1</channel>
   <channel site="sky.com" lang="en" xmltv_id="PopPlus1.uk" site_id="4216">POP+1</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports1Ireland.ie" site_id="1633">Premier Sports 1 Ireland</channel>
-  <channel site="sky.com" lang="en" xmltv_id="PremierSports2Ireland.ie" site_id="1635">Premier Sports 2 Ireland</channel>
+  <channel site="sky.com" lang="en" xmltv_id="PremierSports1.ie" site_id="1633">Premier Sports 1 Ireland</channel>
+  <channel site="sky.com" lang="en" xmltv_id="PremierSports2.ie" site_id="1635">Premier Sports 2 Ireland</channel>
   <channel site="sky.com" lang="en" xmltv_id="PTCPunjabi.in" site_id="5715">PTC PUNJABI</channel>
   <channel site="sky.com" lang="en" xmltv_id="PTVGlobal.pk" site_id="3646">PTV Global</channel>
   <channel site="sky.com" lang="en" xmltv_id="QuestRed.uk" site_id="2410">Quest Red</channel>
@@ -392,7 +392,7 @@
   <channel site="sky.com" lang="hi" xmltv_id="IslamChannelUrdu.uk" site_id="5211">Islam Channel Urdu</channel>
   <channel site="sky.com" lang="hi" xmltv_id="MATVChannel.uk" site_id="3401">MATV Channel</channel>
   <channel site="sky.com" lang="hi" xmltv_id="SanskarTV.in" site_id="1100">Sanskar</channel>
-  <channel site="sky.com" lang="hi" xmltv_id="SonyEntertainmentTelevisionAsia.uk" site_id="4045">Sony TV</channel>
+  <channel site="sky.com" lang="hi" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="4045">Sony TV</channel>
   <channel site="sky.com" lang="hi" xmltv_id="SonyMax2.in" site_id="5431">Sony MAX 2</channel>
   <channel site="sky.com" lang="hi" xmltv_id="SonySABAsia.in" site_id="3631">Sony SAB</channel>
   <channel site="sky.com" lang="hi" xmltv_id="TakbeerTV.uk" site_id="4408">Takbeer TV</channel>
diff --git a/sites/telecablesat.fr/telecablesat.fr.channels.xml b/sites/telecablesat.fr/telecablesat.fr.channels.xml
index f8339253..6de5b4b5 100644
--- a/sites/telecablesat.fr/telecablesat.fr.channels.xml
+++ b/sites/telecablesat.fr/telecablesat.fr.channels.xml
@@ -3,7 +3,7 @@
   <channel site="telecablesat.fr" lang="de" xmltv_id="DasErste.de" site_id="13">Das Erste</channel>
   <channel site="telecablesat.fr" lang="de" xmltv_id="ZDF.de" site_id="219">ZDF</channel>
   <channel site="telecablesat.fr" lang="en" xmltv_id="BBCEntertainment.uk" site_id="18">BBC Entertainment</channel>
-  <channel site="telecablesat.fr" lang="en" xmltv_id="BBCOneEngland.uk" site_id="16">BBC 1</channel>
+  <channel site="telecablesat.fr" lang="en" xmltv_id="BBCOne.uk" site_id="16">BBC 1</channel>
   <channel site="telecablesat.fr" lang="en" xmltv_id="BBCTwo.uk" site_id="17">BBC 2</channel>
   <channel site="telecablesat.fr" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="19">BBC World News</channel>
   <channel site="telecablesat.fr" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="53">CNN</channel>
diff --git a/sites/telenet.tv/telenet.tv.channels.xml b/sites/telenet.tv/telenet.tv.channels.xml
index e7d352a8..2c16f88c 100644
--- a/sites/telenet.tv/telenet.tv.channels.xml
+++ b/sites/telenet.tv/telenet.tv.channels.xml
@@ -3,7 +3,7 @@
   <!-- <channel site="telenet.tv" lang="nl" xmltv_id="" site_id="artebelgique">ARTE Belgique</channel> -->
   <channel site="telenet.tv" lang="en" xmltv_id="2MInternational.ma" site_id="2mmonde">2M Monde</channel>
   <channel site="telenet.tv" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="aljazeeraeng">Al Jazeera English</channel>
-  <channel site="telenet.tv" lang="en" xmltv_id="BBCOneEngland.uk" site_id="bbc1">BBC One</channel>
+  <channel site="telenet.tv" lang="en" xmltv_id="BBCOne.uk" site_id="bbc1">BBC One</channel>
   <channel site="telenet.tv" lang="en" xmltv_id="BBCTwo.uk" site_id="bbc2">BBC Two</channel>
   <channel site="telenet.tv" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="bbcworld">BBC World News Europe</channel>
   <channel site="telenet.tv" lang="en" xmltv_id="BloombergTVEurope.uk" site_id="bloomberg">Bloomberg TV Europe</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch.channels.xml
index eb58cdac..398ee016 100644
--- a/sites/tv.blue.ch/tv.blue.ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch.channels.xml
@@ -392,7 +392,7 @@
   <channel site="tv.blue.ch" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="15">Aljazeera English</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="BBCFour.uk" site_id="35">BBC Four</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="BBCNews.uk" site_id="36">BBC News</channel>
-  <channel site="tv.blue.ch" lang="en" xmltv_id="BBCOneEngland.uk" site_id="37">BBC One</channel>
+  <channel site="tv.blue.ch" lang="en" xmltv_id="BBCOne.uk" site_id="37">BBC One</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="BBCParliament.uk" site_id="1397">BBC Parliament</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="BBCTwo.uk" site_id="39">BBC Two</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="40">BBC World News</channel>
@@ -452,7 +452,7 @@
   <channel site="tv.blue.ch" lang="en" xmltv_id="Now90s.uk" site_id="94">Now 90&apos;s</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="PBSAmerica.uk" site_id="1404">PBS America</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="306">Phoenix InfoNews Channel</channel>
-  <channel site="tv.blue.ch" lang="en" xmltv_id="Pick.uk" site_id="1677">Pick UK</channel>
+  <channel site="tv.blue.ch" lang="en" xmltv_id="SkyMix.uk" site_id="1677">Pick UK</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="Quest.uk" site_id="1604">Quest UK</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="RT.ru" site_id="373">RT News</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="RTRPlanetaEurope.ru" site_id="366">RTR Planeta</channel>
diff --git a/sites/tv24.co.uk/tv24.co.uk.channels.xml b/sites/tv24.co.uk/tv24.co.uk.channels.xml
index acf2b7c5..dcb8511a 100644
--- a/sites/tv24.co.uk/tv24.co.uk.channels.xml
+++ b/sites/tv24.co.uk/tv24.co.uk.channels.xml
@@ -57,7 +57,7 @@
   <channel site="tv24.co.uk" lang="en" xmltv_id="Babestation.uk" site_id="babestation-1">Babestation</channel>
   <channel site="tv24.co.uk" lang="en" xmltv_id="BBCFour.uk" site_id="bbc-four">BBC Four</channel>
   <channel site="tv24.co.uk" lang="en" xmltv_id="BBCNews.uk" site_id="bbc-news">BBC News</channel>
-  <channel site="tv24.co.uk" lang="en" xmltv_id="BBCOneEngland.uk" site_id="bbc-one-hd-england">BBC One HD (England)</channel>
+  <channel site="tv24.co.uk" lang="en" xmltv_id="BBCOne.uk" site_id="bbc-one-hd-england">BBC One HD (England)</channel>
   <channel site="tv24.co.uk" lang="en" xmltv_id="BBCOneLondon.uk" site_id="bbc-one-london">BBC One London</channel>
   <channel site="tv24.co.uk" lang="en" xmltv_id="BBCParliament.uk" site_id="bbc-parliament">BBC Parliament</channel>
   <channel site="tv24.co.uk" lang="en" xmltv_id="BBCRedButton1.uk" site_id="bbc-red-button-1">BBC Red Button 1</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 0676befb..dd7884b1 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -22,7 +22,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BabyTV.uk" site_id="82">Baby TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BalkanEroticHD.si" site_id="1000645">Balkan Erotic HD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BalkanikaTV.bg" site_id="2000000027">Balkanika Music TV</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BalkanTrip.rs" site_id="1000685">Balkan Trip</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BalkanTripTV.rs" site_id="1000685">Balkan Trip</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BBCEarth.ro" site_id="1000482">BBC Earth HD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BBCFirst.pl" site_id="1000652">BBC First HD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BHT1.ba" site_id="1000182">BHT 1</channel>
diff --git a/sites/tvprofil.com/tvprofil.com.channels.xml b/sites/tvprofil.com/tvprofil.com.channels.xml
index 9f8b78c3..6c234a64 100644
--- a/sites/tvprofil.com/tvprofil.com.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com.channels.xml
@@ -134,7 +134,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="B1.ro" site_id="ba/tvprogram#b1-tv">B1</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="B92.rs" site_id="al/programacioni#b92">B92</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BalkanikaTV.bg" site_id="al/programacioni#balkanika">Balkanika Music TV</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="BalkanTrip.rs" site_id="ba/tvprogram#balkan-trip">Balkan Trip</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="BalkanTripTV.rs" site_id="ba/tvprogram#balkan-trip">Balkan Trip</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BBCEarth.ro" site_id="ba/tvprogram#bbc-earth">BBC Earth</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BBCNews.uk" site_id="ba/tvprogram#bbc-news">BBC News</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BBCNewsEurope.uk" site_id="al/programacioni#bbc-world">BBC World News Europe</channel>
diff --git a/sites/virginmedia.com/virginmedia.com.channels.xml b/sites/virginmedia.com/virginmedia.com.channels.xml
index dccaaed6..13c1a7cc 100644
--- a/sites/virginmedia.com/virginmedia.com.channels.xml
+++ b/sites/virginmedia.com/virginmedia.com.channels.xml
@@ -16,7 +16,7 @@
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCALBA.uk" site_id="2150">BBC Alba</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCFour.uk" site_id="2244">BBC Four</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCNews.uk" site_id="1756">BBC News</channel>
-  <channel site="virginmedia.com" lang="en" xmltv_id="BBCOneEngland.uk" site_id="439">BBC One</channel>
+  <channel site="virginmedia.com" lang="en" xmltv_id="BBCOne.uk" site_id="439">BBC One</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCOneLondon.uk" site_id="2248">BBC One London</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCOneNorthernIreland.uk" site_id="2250">BBC One Northern Ireland HD</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="BBCOneScotland.uk" site_id="2249">BBC One Scotland</channel>
@@ -120,7 +120,7 @@
   <channel site="virginmedia.com" lang="en" xmltv_id="Now80s.uk" site_id="1956">Now 80&apos;s</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Now90s.uk" site_id="2030">Now 90&apos;s</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="PBSAmerica.uk" site_id="1574">PBS America</channel>
-  <channel site="virginmedia.com" lang="en" xmltv_id="Pick.uk" site_id="1384">Pick UK</channel>
+  <channel site="virginmedia.com" lang="en" xmltv_id="SkyMix.uk" site_id="1384">Pick UK</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Pop.uk" site_id="1895">Pop</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="QuestRed.uk" site_id="1907">Quest Red UK</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Quest.uk" site_id="1965">Quest</channel>
@@ -167,7 +167,7 @@
   <channel site="virginmedia.com" lang="en" xmltv_id="SkySportsRacing.uk" site_id="329">Sky Sports Racing</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="SkyWitness.uk" site_id="1406">Sky Witness HD</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="SmithsonianChannel.uk" site_id="2028">Smithsonian Channel UK</channel>
-  <channel site="virginmedia.com" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.uk" site_id="425">Sony TV</channel>
+  <channel site="virginmedia.com" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="425">Sony TV</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="SonyMax2.in" site_id="2032">Sony MAX 2</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="SonyMaxUK.uk" site_id="422">Sony Max UK</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="SonySABAsia.in" site_id="1705">Sony SAB</channel>
diff --git a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
index aa061876..6f50a671 100644
--- a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
+++ b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
@@ -60,7 +60,7 @@
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCEntertainment.uk" site_id="3010">BBC Entertainment</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCFirstBenelux.uk" site_id="53">BBC First</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCFour.uk" site_id="86">BBC Four</channel>
-  <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCOneEngland.uk" site_id="49">BBC One</channel>
+  <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCOne.uk" site_id="49">BBC One</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BBCTwo.uk" site_id="55">BBC Two</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BR6TV.nl" site_id="3155">BR6 TV</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="BabyTV.uk" site_id="78">BabyTV</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv.channels.xml b/sites/ziggogo.tv/ziggogo.tv.channels.xml
index 43bc909d..9806eb97 100644
--- a/sites/ziggogo.tv/ziggogo.tv.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv.channels.xml
@@ -9,7 +9,7 @@
   <channel site="ziggogo.tv" lang="en" xmltv_id="2MInternational.ma" site_id="NL_000051_019047">2M Monde</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="NL_000118_019350">Al Jazeera English</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="BBCEntertainment.uk" site_id="NL_000044_019491">BBC Entertainment Europe</channel>
-  <channel site="ziggogo.tv" lang="en" xmltv_id="BBCOneEngland.uk" site_id="NL_000040_020022">BBC One</channel>
+  <channel site="ziggogo.tv" lang="en" xmltv_id="BBCOne.uk" site_id="NL_000040_020022">BBC One</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="BBCTwo.uk" site_id="NL_000041_019369">BBC Two</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="NL_000116_019005">BBC World News Europe</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="CGTN.cn" site_id="NL_000120_020046">CGTN</channel>
@@ -22,7 +22,7 @@
   <channel site="ziggogo.tv" lang="en" xmltv_id="MyZenTV.fr" site_id="NL_000068_020055">MyZen TV</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="PenthouseGold.us" site_id="NL_000171_019313">Penthouse Gold</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="ShortsTV.uk" site_id="NL_000060_019297">Shorts TV</channel>
-  <channel site="ziggogo.tv" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.uk" site_id="NL_000155_020073">SET Asia</channel>
+  <channel site="ziggogo.tv" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="NL_000155_020073">SET Asia</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="UtsavGold.in" site_id="NL_000151_020074">Utsav Gold</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="UtsavPlus.uk" site_id="NL_000150_020075">Utsav Plus</channel>
   <channel site="ziggogo.tv" lang="en" xmltv_id="XMO.nl" site_id="NL_000176_019308">X-MO</channel>