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 38b12aaa..3b97140f 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -60,7 +60,7 @@
     <channel lang="ms" xmltv_id="CGTN.cn" site_id="426">CGTN</channel>
     <channel lang="ms" xmltv_id="CNA.sg" site_id="295">CNA</channel>
     <channel lang="ms" xmltv_id="CNBCAsia.sg" site_id="423">CNBC Asia-Pacific</channel>
-    <channel lang="ms" xmltv_id="CNNInternationalAsiaPacific.us" site_id="336">CNN International Asia Pacific</channel>
+    <channel lang="ms" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="336">CNN International Asia Pacific</channel>
     <channel lang="ms" xmltv_id="CTITVAsia.tw" site_id="424">CTI TV Asia</channel>
     <channel lang="ms" xmltv_id="CartoonNetworkAsia.sg" site_id="371">Cartoon Network HD</channel>
     <channel lang="ms" xmltv_id="CelestialClassicMovies.hk" site_id="187">Celestial Classic Movies</channel>
@@ -103,7 +103,7 @@
     <channel lang="ms" xmltv_id="NTV7.my" site_id="93">NTV 7</channel>
     <channel lang="ms" xmltv_id="NatGeoPeopleAsia.us" site_id="199">Nat Geo People Asia</channel>
     <channel lang="ms" xmltv_id="NationalGeographicAsia.us" site_id="140">National Geographic Asia</channel>
-    <channel lang="ms" xmltv_id="NationalGeographicWildAsia.us" site_id="322">National Geographic Wild Asia</channel>
+    <channel lang="ms" xmltv_id="NationalGeographicWildAsia.hk" site_id="322">National Geographic Wild Asia</channel>
     <channel lang="ms" xmltv_id="NickJrAsia.sg" site_id="392">Nick Jr Asia</channel>
     <channel lang="ms" xmltv_id="NickelodeonAsia.sg" site_id="370">Nickelodeon South East Asia</channel>
     <channel lang="ms" xmltv_id="NjoiTV.my" site_id="302">Njoi TV</channel>
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 f1f39d57..49649eb1 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="fr" xmltv_id="APlus.fr" site_id="50416">A+</channel>
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="50007">ARTE Français</channel>
     <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="BBCWorldNewsNorthAmerica.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.fr" site_id="50115">BeIn Sports 1 France</channel>
     <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</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 f1f39d57..49649eb1 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="fr" xmltv_id="APlus.fr" site_id="50416">A+</channel>
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="50007">ARTE Français</channel>
     <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="BBCWorldNewsNorthAmerica.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.fr" site_id="50115">BeIn Sports 1 France</channel>
     <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</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 f1f39d57..49649eb1 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="fr" xmltv_id="APlus.fr" site_id="50416">A+</channel>
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="50007">ARTE Français</channel>
     <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="BBCWorldNewsNorthAmerica.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.fr" site_id="50115">BeIn Sports 1 France</channel>
     <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</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 f1f39d57..49649eb1 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="fr" xmltv_id="APlus.fr" site_id="50416">A+</channel>
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="50007">ARTE Français</channel>
     <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="BBCWorldNewsNorthAmerica.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.fr" site_id="50115">BeIn Sports 1 France</channel>
     <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</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 f1f39d57..49649eb1 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="fr" xmltv_id="APlus.fr" site_id="50416">A+</channel>
     <channel lang="fr" xmltv_id="ARTEFrench.fr" site_id="50007">ARTE Français</channel>
     <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="BBCWorldNewsNorthAmerica.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.fr" site_id="50115">BeIn Sports 1 France</channel>
     <channel lang="fr" xmltv_id="BeINSports2France.fr" site_id="50243">BeIn Sports 2 France</channel>
diff --git a/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml b/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
index ca1c0fdc..6d2d8301 100644
--- a/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
+++ b/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
@@ -7,7 +7,7 @@
     <channel lang="fr" xmltv_id="Alizes.gp" site_id="51365">Alizés</channel>
     <channel lang="fr" xmltv_id="APlus.fr" site_id="51416">A+</channel>
     <channel lang="fr" xmltv_id="Automotolachaine.fr" site_id="51565">Automoto la chaîne</channel>
-    <channel lang="fr" xmltv_id="BBCWorldNewsAmericas.uk" site_id="51008">BBC World News Americas</channel>
+    <channel lang="fr" xmltv_id="BBCWorldNewsNorthAmerica.uk" site_id="51008">BBC World News Americas</channel>
     <channel lang="fr" xmltv_id="BblackCaribbean.fr" site_id="51557">Bblack! Caribbean</channel>
     <channel lang="fr" xmltv_id="C8.fr" site_id="51120">C8</channel>
     <channel lang="fr" xmltv_id="Canal10.gp" site_id="51176">Canal 10</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index 45a14b27..b9f9224e 100644
--- a/sites/directv.com/directv.com_us.channels.xml
+++ b/sites/directv.com/directv.com_us.channels.xml
@@ -27,7 +27,7 @@
     <channel lang="en" xmltv_id="BandamaxEstadosUnidos.us" site_id="433">Bandamax Estados Unidos</channel>
     <channel lang="en" xmltv_id="BangU.us" site_id="596">Bang U</channel>
     <channel lang="en" xmltv_id="BBCAmericaEast.us" site_id="264">BBC America East</channel>
-    <channel lang="en" xmltv_id="BBCWorldNewsAmericas.uk" site_id="346">BBC World News Americas</channel>
+    <channel lang="en" xmltv_id="BBCWorldNewsNorthAmerica.uk" site_id="346">BBC World News Americas</channel>
     <channel lang="en" xmltv_id="BestChannel.us" site_id="88">Best Channel</channel>
     <channel lang="en" xmltv_id="BETEast.us" site_id="329">BET East</channel>
     <channel lang="en" xmltv_id="BETHerEast.us" site_id="330">BET Her East</channel>
@@ -258,8 +258,8 @@
     <channel lang="en" xmltv_id="PhoenixNorthAmericaChineseChannel.hk" site_id="2050">Phoenix North America Chinese Channel</channel>
     <channel lang="en" xmltv_id="PinoyBoxOfficeGlobal.ph" site_id="2062">Pinoy Box Office Global</channel>
     <channel lang="en" xmltv_id="PlayboyTVMonthlyOffer.us" site_id="575">Playboy TV Monthly Offer</channel>
-    <channel lang="en" xmltv_id="PlayboyTVUSA.us" site_id="577">Playboy TV USA</channel>
-    <channel lang="en" xmltv_id="PlayboyTVUSAHD.us" site_id="576">Playboy TV USA HD</channel>
+    <channel lang="en" xmltv_id="PlayboyTV.us" site_id="577">Playboy TV USA</channel>
+    <channel lang="en" xmltv_id="PlayboyTVHD.us" site_id="576">Playboy TV USA HD</channel>
     <channel lang="en" xmltv_id="PopEast.us" site_id="273">Pop East</channel>
     <channel lang="en" xmltv_id="PrimeTV.us" site_id="81">Prime TV</channel>
     <channel lang="en" xmltv_id="QVC2.us" site_id="76">QVC 2</channel>
diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index 593c9aa3..f72d54d4 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -165,7 +165,7 @@
     <channel lang="en" xmltv_id="NaaptolTamil.in" site_id="10000000025590000">Naaptol Tamil</channel>
     <channel lang="en" xmltv_id="NandighoshaTV.in" site_id="10000000072550000">Nandighosha TV</channel>
     <channel lang="en" xmltv_id="NationalGeographicIndia.in" site_id="10000000005780000">National Geographic India</channel>
-    <channel lang="en" xmltv_id="NationalGeographicWildAsia.us" site_id="10000000013430000">National Geographic Wild Asia</channel>
+    <channel lang="en" xmltv_id="NationalGeographicWildAsia.hk" site_id="10000000013430000">National Geographic Wild Asia</channel>
     <channel lang="en" xmltv_id="NaxatraNews.in" site_id="10000000016110000">Naxatra News</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="10000000000500000">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NDTVIndia.in" site_id="10000000000490000">NDTV India</channel>
diff --git a/sites/mi.tv/mi.tv_br.channels.xml b/sites/mi.tv/mi.tv_br.channels.xml
index 2e78dd9b..dace431a 100644
--- a/sites/mi.tv/mi.tv_br.channels.xml
+++ b/sites/mi.tv/mi.tv_br.channels.xml
@@ -15,7 +15,7 @@
     <channel lang="pt" xmltv_id="BandNews.br" site_id="br#band-news">Band News</channel>
     <channel lang="pt" xmltv_id="BandSaoPaulo.br" site_id="br#band">Band São Paulo</channel>
     <channel lang="pt" xmltv_id="BandSports.br" site_id="br#bandsports">Band Sports</channel>
-    <channel lang="pt" xmltv_id="BBCWorldNewsAmericas.uk" site_id="br#bbc-news">BBC World News Americas</channel>
+    <channel lang="pt" xmltv_id="BBCWorldNewsNorthAmerica.uk" site_id="br#bbc-news">BBC World News Americas</channel>
     <channel lang="pt" xmltv_id="Bis.br" site_id="br#bis-hd">Bis</channel>
     <channel lang="pt" xmltv_id="BloombergTVBrazil.br" site_id="br#bloomberg">Bloomberg TV Brazil</channel>
     <channel lang="pt" xmltv_id="BoasNovas.br" site_id="br#rede-boas-novas">Boas Novas</channel>
@@ -33,7 +33,7 @@
     <channel lang="pt" xmltv_id="CineBrasilTV.br" site_id="br#cinebrasil-tv">CineBrasil TV</channel>
     <channel lang="pt" xmltv_id="CinemaxBrasil.br" site_id="br#cinemax">Cinemax Brasil</channel>
     <channel lang="pt" xmltv_id="CNNBrasil.br" site_id="br#cnn-brasil">CNN Brasil</channel>
-    <channel lang="pt" xmltv_id="CNNInternationalAsiaPacific.us" site_id="br#cnn-international-hd">CNN International Asia Pacific</channel>
+    <channel lang="pt" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="br#cnn-international-hd">CNN International Asia Pacific</channel>
     <channel lang="pt" xmltv_id="ComedyCentralBrazil.us" site_id="br#comedy-central">Comedy Central Brasil</channel>
     <channel lang="pt" xmltv_id="ConmebolTV1.br" site_id="br#conmebol-tv-1">Conmebol TV 1</channel>
     <channel lang="pt" xmltv_id="ConmebolTV2.br" site_id="br#conmebol-tv-2">Conmebol TV 2</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index 6f2fd613..9f795b7e 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -28,7 +28,7 @@
     <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="8">Cinemax Asia</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
-    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.us" site_id="333">CNN International Asia Pacific</channel>
+    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation Asia</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="201">Discovery Channel Southeast Asia</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
@@ -72,7 +72,7 @@
     <channel lang="en" xmltv_id="MusicTV.id" site_id="111">Music TV</channel>
     <channel lang="en" xmltv_id="MuslimTV.id" site_id="92">Muslim TV</channel>
     <channel lang="en" xmltv_id="NationalGeographicAsia.us" site_id="202">National Geographic Asia</channel>
-    <channel lang="en" xmltv_id="NationalGeographicWildAsia.us" site_id="204">National Geographic Wild Asia</channel>
+    <channel lang="en" xmltv_id="NationalGeographicWildAsia.hk" site_id="204">National Geographic Wild Asia</channel>
     <channel lang="en" xmltv_id="NET.id" site_id="116">NET</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="355">NHK World Japan</channel>
     <channel lang="en" xmltv_id="NHKWorldPremium.jp" site_id="354">NHK World Premium</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index fba0a4ef..71412465 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -28,7 +28,7 @@
     <channel lang="id" xmltv_id="CinemaxAsia.us" site_id="8">Cinemax Asia</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
-    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.us" site_id="333">CNN International Asia Pacific</channel>
+    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation Asia</channel>
     <channel lang="id" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="201">Discovery Channel Southeast Asia</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
@@ -72,7 +72,7 @@
     <channel lang="id" xmltv_id="MusicTV.id" site_id="111">Music TV</channel>
     <channel lang="id" xmltv_id="MuslimTV.id" site_id="92">Muslim TV</channel>
     <channel lang="id" xmltv_id="NationalGeographicAsia.us" site_id="202">National Geographic Asia</channel>
-    <channel lang="id" xmltv_id="NationalGeographicWildAsia.us" site_id="204">National Geographic Wild Asia</channel>
+    <channel lang="id" xmltv_id="NationalGeographicWildAsia.hk" site_id="204">National Geographic Wild Asia</channel>
     <channel lang="id" xmltv_id="NET.id" site_id="116">NET</channel>
     <channel lang="id" xmltv_id="NHKWorldJapan.jp" site_id="355">NHK World Japan</channel>
     <channel lang="id" xmltv_id="NHKWorldPremium.jp" site_id="354">NHK World Premium</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index 0a0b9169..aa12f066 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -152,7 +152,7 @@
     <channel lang="sr" xmltv_id="MTVHitsEurope.uk" site_id="474#168">MTV Hits Europe</channel>
     <channel lang="sr" xmltv_id="MuzsikaTV.hu" site_id="684#278">Muzsika TV</channel>
     <channel lang="sr" xmltv_id="Muzzik.rs" site_id="456#286">Muzzik</channel>
-    <channel lang="sr" xmltv_id="NatGeoWildEurope.us" site_id="354#121">Nat Geo Wild Europe</channel>
+    <channel lang="sr" xmltv_id="NationalGeographicWildEurope.us" site_id="354#121">Nat Geo Wild Europe</channel>
     <channel lang="sr" xmltv_id="NationalGeographicSrbija.rs" site_id="353#119">National Geographic Srbija</channel>
     <channel lang="sr" xmltv_id="NBATV.us" site_id="311#634">NBA TV</channel>
     <channel lang="sr" xmltv_id="NickelodeonSerbia.rs" site_id="400#94">Nickelodeon</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 d3063cdd..68822818 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
@@ -26,7 +26,7 @@
     <channel lang="en" xmltv_id="CinemaxAsia.us" site_id="113">Cinemax Asia</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="319">CNBC Asia-Pacific</channel>
-    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.us" site_id="316">CNN International Asia Pacific</channel>
+    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN International Asia Pacific</channel>
     <channel lang="en" xmltv_id="ColorsAsiaPacific.in" site_id="780">Colors Asia Pacific</channel>
     <channel lang="en" xmltv_id="CTITVAsia.tw" site_id="538">CTI TV Asia</channel>
     <channel lang="en" xmltv_id="DaVinciAsia.de" site_id="460">Da Vinci Asia</channel>
@@ -63,7 +63,7 @@
     <channel lang="en" xmltv_id="MTVIndia.in" site_id="779">MTV India</channel>
     <channel lang="en" xmltv_id="MUTV.uk" site_id="640">MUTV</channel>
     <channel lang="en" xmltv_id="NationalGeographicAsia.us" site_id="215">National Geographic Asia</channel>
-    <channel lang="en" xmltv_id="NationalGeographicWildAsia.us" site_id="216">National Geographic Wild Asia</channel>
+    <channel lang="en" xmltv_id="NationalGeographicWildAsia.hk" site_id="216">National Geographic Wild Asia</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="328">NHK World Japan</channel>
     <channel lang="en" xmltv_id="NHKWorldPremium.jp" site_id="711">NHK World Premium</channel>
     <channel lang="en" xmltv_id="NickelodeonAsia.sg" site_id="444">Nickelodeon South East 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 737f2a74..c0603e19 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
@@ -26,7 +26,7 @@
     <channel lang="zh" xmltv_id="CinemaxAsia.us" site_id="113">Cinemax Asia</channel>
     <channel lang="zh" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="zh" xmltv_id="CNBCAsia.sg" site_id="319">CNBC Asia-Pacific</channel>
-    <channel lang="zh" xmltv_id="CNNInternationalAsiaPacific.us" site_id="316">CNN International Asia Pacific</channel>
+    <channel lang="zh" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN International Asia Pacific</channel>
     <channel lang="zh" xmltv_id="ColorsAsiaPacific.in" site_id="780">Colors Asia Pacific</channel>
     <channel lang="zh" xmltv_id="CTITVAsia.tw" site_id="538">CTI TV Asia</channel>
     <channel lang="zh" xmltv_id="DaVinciAsia.de" site_id="460">Da Vinci Asia</channel>
@@ -63,7 +63,7 @@
     <channel lang="zh" xmltv_id="MTVIndia.in" site_id="779">MTV India</channel>
     <channel lang="zh" xmltv_id="MUTV.uk" site_id="640">MUTV</channel>
     <channel lang="zh" xmltv_id="NationalGeographicAsia.us" site_id="215">National Geographic Asia</channel>
-    <channel lang="zh" xmltv_id="NationalGeographicWildAsia.us" site_id="216">National Geographic Wild Asia</channel>
+    <channel lang="zh" xmltv_id="NationalGeographicWildAsia.hk" site_id="216">National Geographic Wild Asia</channel>
     <channel lang="zh" xmltv_id="NHKWorldJapan.jp" site_id="328">NHK World Japan</channel>
     <channel lang="zh" xmltv_id="NHKWorldPremium.jp" site_id="711">NHK World Premium</channel>
     <channel lang="zh" xmltv_id="NickelodeonAsia.sg" site_id="444">Nickelodeon South East Asia</channel>
diff --git a/sites/rev.bs/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
index 94633a07..04d0d92c 100644
--- a/sites/rev.bs/rev.bs_bs.channels.xml
+++ b/sites/rev.bs/rev.bs_bs.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="en" xmltv_id="AXSTV.us" site_id="369">AXS TV</channel>
     <channel lang="en" xmltv_id="BabyFirst.us" site_id="318">BabyFirst TV</channel>
     <channel lang="en" xmltv_id="BBCAmericaEast.us" site_id="485">BBC America East</channel>
-    <channel lang="en" xmltv_id="BBCWorldNewsAmericas.uk" site_id="409">BBC World News Americas</channel>
+    <channel lang="en" xmltv_id="BBCWorldNewsNorthAmerica.uk" site_id="409">BBC World News Americas</channel>
     <channel lang="en" xmltv_id="BCNTV.bs" site_id="660">BCN TV</channel>
     <channel lang="en" xmltv_id="BETEast.us" site_id="356">BET East</channel>
     <channel lang="en" xmltv_id="BETGospel.us" site_id="385">BET Gospel</channel>
diff --git a/sites/seezntv.com/seezntv.com_kr.channels.xml b/sites/seezntv.com/seezntv.com_kr.channels.xml
index 6e2b33b8..9bcb628e 100644
--- a/sites/seezntv.com/seezntv.com_kr.channels.xml
+++ b/sites/seezntv.com/seezntv.com_kr.channels.xml
@@ -13,8 +13,8 @@
     <channel lang="ko" xmltv_id="CarryTV.kr" site_id="506">캐리TV</channel>
     <channel lang="ko" xmltv_id="ChannelA.kr" site_id="467">채널A</channel>
     <channel lang="ko" xmltv_id="ChannelChina.kr" site_id="458">채널차이나</channel>
-    <channel lang="ko" xmltv_id="ChannelOllehTV.kr" site_id="404">채널 olleh tv</channel>
-    <channel lang="ko" xmltv_id="ChannelSeezn.kr" site_id="470">채널 seezn</channel>
+    <channel lang="ko" xmltv_id="ChOllehTV.kr" site_id="404">채널 olleh tv</channel>
+    <channel lang="ko" xmltv_id="ChSeezn.kr" site_id="470">채널 seezn</channel>
     <channel lang="ko" xmltv_id="ChunghwaTV.kr" site_id="287">중화TV</channel>
     <channel lang="ko" xmltv_id="CinemaHeaven.kr" site_id="821">시네마천국</channel>
     <channel lang="ko" xmltv_id="CJOnStyle.kr" site_id="464">CJ ONSTYLE</channel>
@@ -63,7 +63,7 @@
     <channel lang="ko" xmltv_id="OGN.kr" site_id="288">OGN</channel>
     <channel lang="ko" xmltv_id="OLife.kr" site_id="503">OLIFE</channel>
     <channel lang="ko" xmltv_id="Olive.kr" site_id="281">Olive</channel>
-    <channel lang="ko" xmltv_id="Pinkfong.kr" site_id="505">핑크퐁</channel>
+    <channel lang="ko" xmltv_id="ChPinkfong.kr" site_id="505">핑크퐁</channel>
     <channel lang="ko" xmltv_id="PlayboyTVKorea.kr" site_id="500">플레이보이 TV</channel>
     <channel lang="ko" xmltv_id="PLAYYActionMovie.kr" site_id="468">PLAYY 액션 영화</channel>
     <channel lang="ko" xmltv_id="PLAYYHealingMovie.kr" site_id="469">PLAYY 힐링 영화</channel>
diff --git a/sites/telenettv.be/telenettv.be_be.channels.xml b/sites/telenettv.be/telenettv.be_be.channels.xml
index 846d7fc2..1cb2ba9c 100644
--- a/sites/telenettv.be/telenettv.be_be.channels.xml
+++ b/sites/telenettv.be/telenettv.be_be.channels.xml
@@ -63,7 +63,7 @@
     <channel lang="be" xmltv_id="MezzoLiveHD.fr" site_id="mezzo">Mezzo Live HD</channel>
     <channel lang="be" xmltv_id="MTV00s.uk" site_id="vh1">MTV 00s</channel>
     <channel lang="be" xmltv_id="MTVLive.uk" site_id="mtvnhd">MTV Live</channel>
-    <channel lang="be" xmltv_id="NatGeoWildEurope.us" site_id="natgeowild">Nat Geo Wild Europe</channel>
+    <channel lang="be" xmltv_id="NationalGeographicWildEurope.us" site_id="natgeowild">Nat Geo Wild Europe</channel>
     <channel lang="be" xmltv_id="NickelodeonFrance.fr" site_id="nickelodeonfr">Nickelodeon France</channel>
     <channel lang="be" xmltv_id="NickelodeonJunior.fr" site_id="nickjr">Nick Jr</channel>
     <channel lang="be" xmltv_id="Njam.be" site_id="njam">Njam!</channel>
diff --git a/sites/transvision.co.id/transvision.co.id_id.channels.xml b/sites/transvision.co.id/transvision.co.id_id.channels.xml
index 1ea121bf..979f546c 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="id" xmltv_id="CinemaxAsia.us" site_id="CMX">CINEMAX HD</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="CNBC">CNBC Asia</channel>
     <channel lang="id" xmltv_id="CNNIndonesia.id" site_id="CNI">CNN Indonesia HD</channel>
-    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.us" site_id="CNN">CNN International HD</channel>
+    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="CI">Crime &amp; Investigation HD</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="DVL">Da Vinci</channel>
     <channel lang="id" xmltv_id="DaAiTVIndonesia.id" site_id="DAAI">DAAI TV</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index 9ac47a20..fb437fba 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -208,7 +208,7 @@
     <channel lang="en" xmltv_id="BBCOne.uk" site_id="37">BBC One</channel>
     <channel lang="en" xmltv_id="BBCParliament.uk" site_id="1397">BBC Parliament</channel>
     <channel lang="en" xmltv_id="BBCTwo.uk" site_id="39">BBC Two</channel>
-    <channel lang="en" xmltv_id="BBCWorldNews.uk" site_id="40">BBC World News</channel>
+    <channel lang="en" xmltv_id="BBCWorldNewsEurope.uk" site_id="40">BBC World News</channel>
     <channel lang="en" xmltv_id="BloombergTVEurope.us" site_id="46">Bloomberg TV Europe</channel>
     <channel lang="en" xmltv_id="CBBC.uk" site_id="85">CBBC</channel>
     <channel lang="en" xmltv_id="CBeebiesUK.uk" site_id="86">CBeebies UK</channel>
diff --git a/sites/tv.nu/tv.nu_se.channels.xml b/sites/tv.nu/tv.nu_se.channels.xml
index e9d415b5..9fbbabdc 100644
--- a/sites/tv.nu/tv.nu_se.channels.xml
+++ b/sites/tv.nu/tv.nu_se.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="sv" xmltv_id="ATGLive.se" site_id="atg-live">ATG Live</channel>
     <channel lang="sv" xmltv_id="BBCBritNordic.uk" site_id="bbc-brit">BBC Brit</channel>
     <channel lang="sv" xmltv_id="BBCEarthNordic.uk" site_id="bbc-earth">BBC Earth</channel>
-    <channel lang="sv" xmltv_id="BBCWorldNews.uk" site_id="bbc-world-news">BBC World News</channel>
+    <channel lang="sv" xmltv_id="BBCWorldNewsEurope.uk" site_id="bbc-world-news">BBC World News</channel>
     <channel lang="sv" xmltv_id="BloombergTVEurope.us" site_id="bloomberg-tv-hd">Bloomberg TV HD</channel>
     <channel lang="sv" xmltv_id="BoomerangNordic.us" site_id="boomerang">Boomerang</channel>
     <channel lang="sv" xmltv_id="BrazzersTVEurope.us" site_id="brazzers-tv-plus">BraZZers TV Plus</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 b9091133..bcafda96 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -15,7 +15,7 @@
     <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>
     <channel lang="th" xmltv_id="CNBCAsia.sg" site_id="cnbc">CNBC Asia-Pacific</channel>
-    <channel lang="th" xmltv_id="CNNInternationalAsiaPacific.us" site_id="cnn-hd">CNN International Asia Pacific</channel>
+    <channel lang="th" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="cnn-hd">CNN International Asia Pacific</channel>
     <channel lang="th" xmltv_id="DiscoveryAsia.us" site_id="hybrid-discoveryasia">Discovery Asia</channel>
     <channel lang="th" xmltv_id="DiscoveryChannelSoutheastAsia.us" site_id="hybrid-discoverychannel">Discovery Channel Southeast Asia</channel>
     <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="hybrid-dreamworks-hd">DreamWorks TV Asia</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index ca70909e..eccfc3a8 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -67,7 +67,7 @@
     <channel lang="en" xmltv_id="BallySportsWisconsin.us" site_id="102069">Bally Sports Wisconsin</channel>
     <channel lang="en" xmltv_id="BBCAmericaEast.us" site_id="18332">BBC America East</channel>
     <channel lang="en" xmltv_id="BBCAmericaWest.us" 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="BBCWorldNewsNorthAmerica.uk" site_id="89690">BBC World News (North America)</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>
@@ -113,7 +113,7 @@
     <channel lang="en" xmltv_id="CNBCWorld.us" site_id="26849">CNBC World</channel>
     <channel lang="en" xmltv_id="CNN.us" site_id="58646">CNN</channel>
     <channel lang="en" xmltv_id="CNNenEspanol.us" site_id="58631">CNN en Español</channel>
-    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.us" site_id="40821">CNN International Asia</channel>
+    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="40821">CNN International Asia</channel>
     <channel lang="en" xmltv_id="CNNInternationalLatinAmerica.us" site_id="15192">CNN International Latin America</channel>
     <channel lang="en" xmltv_id="CNNInternationalNorthAmerica.us" site_id="83110">CNN International</channel>
     <channel lang="en" xmltv_id="ColorsBangla.in" site_id="72103">Colors Bangla</channel>
diff --git a/sites/wavve.com/wavve.com_kr.channels.xml b/sites/wavve.com/wavve.com_kr.channels.xml
index f955f372..b8b341b3 100644
--- a/sites/wavve.com/wavve.com_kr.channels.xml
+++ b/sites/wavve.com/wavve.com_kr.channels.xml
@@ -55,7 +55,7 @@
     <channel lang="ko" xmltv_id="MTN.kr" site_id="F4301">머니투데이방송</channel>
     <channel lang="ko" xmltv_id="NationalAssemblyTV.kr" site_id="F3301">국회방송</channel>
     <channel lang="ko" xmltv_id="NickelodeonKorea.kr" site_id="S10">SBS Nick</channel>
-    <channel lang="ko" xmltv_id="NSHomeshopping.kr" site_id="C8301">NS홈쇼핑</channel>
+    <channel lang="ko" xmltv_id="NSHomeShopping.kr" site_id="C8301">NS홈쇼핑</channel>
     <channel lang="ko" xmltv_id="NSShopPlus.kr" site_id="C8302">NS SHOP+</channel>
     <channel lang="ko" xmltv_id="PolarisTV.kr" site_id="C6901">폴라리스TV</channel>
     <channel lang="ko" xmltv_id="SBSBiz.kr" site_id="S06">SBS Biz</channel>
@@ -75,7 +75,7 @@
     <channel lang="ko" xmltv_id="TVChosun.kr" site_id="C2601">TV CHOSUN</channel>
     <channel lang="ko" xmltv_id="TVChosun2.kr" site_id="C2602">TV CHOSUN2</channel>
     <channel lang="ko" xmltv_id="Vlending.kr" site_id="C7801">블렌딩 뮤직비디오</channel>
-    <channel lang="ko" xmltv_id="WowTV.kr" site_id="F2101">한국경제TV</channel>
+    <channel lang="ko" xmltv_id="KETV.kr" site_id="F2101">한국경제TV</channel>
     <channel lang="ko" xmltv_id="YonhapNewsTV.kr" site_id="Y01">연합뉴스TV</channel>
     <channel lang="ko" xmltv_id="YTN.kr" site_id="C2101">YTN</channel>
   </channels>