diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml
index 16cae949..eec8bfe5 100644
--- a/sites/allente.se/allente.se_dk.channels.xml
+++ b/sites/allente.se/allente.se_dk.channels.xml
@@ -32,9 +32,9 @@
     <channel lang="da" xmltv_id="NationalGeographicChannelHDEurope.us" site_id="dk#0083">National Geographic Channel HD Europe</channel>
     <channel lang="da" xmltv_id="NationalGeographicDanmark.us" site_id="dk#0317">National Geographic Danmark</channel>
     <channel lang="da" xmltv_id="NationalGeographicWildEurope.us" site_id="dk#0082">National Geographic Wild Europe</channel>
-    <channel lang="da" xmltv_id="NickelodeonDanmark.us" site_id="dk#0087">Nickelodeon Danmark</channel>
-    <channel lang="da" xmltv_id="NickJrScandinavia.us" site_id="dk#0088">Nick Jr Scandinavia</channel>
-    <channel lang="da" xmltv_id="NicktoonsScandinavia.us" site_id="dk#570">Nicktoons Scandinavia</channel>
+    <channel lang="da" xmltv_id="NickelodeonDenmark.dk" site_id="dk#0087">Nickelodeon Danmark</channel>
+    <channel lang="da" xmltv_id="NickJrScandinavia.nl" site_id="dk#0088">Nick Jr Scandinavia</channel>
+    <channel lang="da" xmltv_id="NicktoonsScandinavia.nl" site_id="dk#570">Nicktoons Scandinavia</channel>
     <channel lang="da" xmltv_id="NRK1.no" site_id="dk#0090">NRK1</channel>
     <channel lang="da" xmltv_id="ParamountNetworkDanmark.us" site_id="dk#450">Paramount Network Danmark</channel>
     <channel lang="da" xmltv_id="SFkanalen.se" site_id="dk#972">SF-kanalen</channel>
diff --git a/sites/allente.se/allente.se_fi.channels.xml b/sites/allente.se/allente.se_fi.channels.xml
index 02269260..e541587e 100644
--- a/sites/allente.se/allente.se_fi.channels.xml
+++ b/sites/allente.se/allente.se_fi.channels.xml
@@ -13,7 +13,7 @@
     <channel lang="fi" xmltv_id="NationalGeographicChannelHDEurope.us" site_id="fi#0083">National Geographic Channel HD Europe</channel>
     <channel lang="fi" xmltv_id="NationalGeographicScandinavia.us" site_id="fi#0084">National Geographic Scandinavia</channel>
     <channel lang="fi" xmltv_id="NationalGeographicWildEurope.us" site_id="fi#558">National Geographic Wild Europe</channel>
-    <channel lang="fi" xmltv_id="NickJrScandinavia.us" site_id="fi#0088">Nick Jr Scandinavia</channel>
+    <channel lang="fi" xmltv_id="NickJrScandinavia.nl" site_id="fi#0088">Nick Jr Scandinavia</channel>
     <channel lang="fi" xmltv_id="TV3Sverige.se" site_id="fi#0290">TV 3 Sverige</channel>
     <channel lang="fi" xmltv_id="TV6Sverige.se" site_id="fi#0360">TV 6 Sverige</channel>
     <channel lang="fi" xmltv_id="VFilmAction.se" site_id="fi#0299">V Film Action</channel>
diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml
index f8f3cb7b..62ed11f7 100644
--- a/sites/allente.se/allente.se_no.channels.xml
+++ b/sites/allente.se/allente.se_no.channels.xml
@@ -26,9 +26,9 @@
     <channel lang="no" xmltv_id="NationalGeographicNorway.us" site_id="no#0316">National Geographic Norge</channel>
     <channel lang="no" xmltv_id="NationalGeographicWildEurope.us" site_id="no#558">National Geographic Wild Europe</channel>
     <channel lang="no" xmltv_id="NFLNetwork.us" site_id="no#556">NFL Network</channel>
-    <channel lang="no" xmltv_id="NickelodeonNorway.us" site_id="no#0087">Nickelodeon Norge</channel>
-    <channel lang="no" xmltv_id="NickJrScandinavia.us" site_id="no#0088">Nick Jr Scandinavia</channel>
-    <channel lang="no" xmltv_id="NicktoonsScandinavia.us" site_id="no#570">Nicktoons Scandinavia</channel>
+    <channel lang="no" xmltv_id="NickelodeonNorway.no" site_id="no#0087">Nickelodeon Norge</channel>
+    <channel lang="no" xmltv_id="NickJrScandinavia.nl" site_id="no#0088">Nick Jr Scandinavia</channel>
+    <channel lang="no" xmltv_id="NicktoonsScandinavia.nl" site_id="no#570">Nicktoons Scandinavia</channel>
     <channel lang="no" xmltv_id="NRK1.no" site_id="no#0091">NRK1</channel>
     <channel lang="no" xmltv_id="NRK2.no" site_id="no#0288">NRK2</channel>
     <channel lang="no" xmltv_id="NRK3.no" site_id="no#0289">NRK3</channel>
diff --git a/sites/allente.se/allente.se_se.channels.xml b/sites/allente.se/allente.se_se.channels.xml
index 97438bbc..7dec1cc8 100644
--- a/sites/allente.se/allente.se_se.channels.xml
+++ b/sites/allente.se/allente.se_se.channels.xml
@@ -49,9 +49,9 @@
     <channel lang="sv" xmltv_id="NationalGeographicScandinavia.us" site_id="se#0084">National Geographic Scandinavia</channel>
     <channel lang="sv" xmltv_id="NationalGeographicWildEurope.us" site_id="se#558">National Geographic Wild Europe</channel>
     <channel lang="sv" xmltv_id="NFLNetwork.us" site_id="se#569">NFL Network</channel>
-    <channel lang="sv" xmltv_id="NickelodeonSverige.us" site_id="se#0086">Nickelodeon Sverige</channel>
-    <channel lang="sv" xmltv_id="NickJrScandinavia.us" site_id="se#0088">Nick Jr Scandinavia</channel>
-    <channel lang="sv" xmltv_id="NicktoonsScandinavia.us" site_id="se#570">Nicktoons Scandinavia</channel>
+    <channel lang="sv" xmltv_id="NickelodeonScandinavia.nl" site_id="se#0086">Nickelodeon Sverige</channel>
+    <channel lang="sv" xmltv_id="NickJrScandinavia.nl" site_id="se#0088">Nick Jr Scandinavia</channel>
+    <channel lang="sv" xmltv_id="NicktoonsScandinavia.nl" site_id="se#570">Nicktoons Scandinavia</channel>
     <channel lang="sv" xmltv_id="NRK1.no" site_id="se#0091">NRK1</channel>
     <channel lang="sv" xmltv_id="NRK2.no" site_id="se#0288">NRK2</channel>
     <channel lang="sv" xmltv_id="NRK3.no" site_id="se#540">NRK3</channel>
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 a4ce31d1..ed720380 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -107,8 +107,8 @@
     <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="NickJrAsia.us" site_id="392">Nick Jr Asia</channel>
-    <channel lang="ms" xmltv_id="NickelodeonSouthEastAsia.us" site_id="370">Nickelodeon South East 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>
     <channel lang="ms" xmltv_id="OhK.us" site_id="191">Oh! K</channel>
     <channel lang="ms" xmltv_id="One.in" site_id="133">One</channel>
diff --git a/sites/bt.com/bt.com_uk.channels.xml b/sites/bt.com/bt.com_uk.channels.xml
index 8ae466f0..1ae850fc 100644
--- a/sites/bt.com/bt.com_uk.channels.xml
+++ b/sites/bt.com/bt.com_uk.channels.xml
@@ -111,9 +111,9 @@
     <channel lang="en" xmltv_id="More4UKPlus1.uk" site_id="hsxh">More4+1</channel>
     <channel lang="en" xmltv_id="MTVUK.us" site_id="hsrh">MTV UK</channel>
     <channel lang="en" xmltv_id="NationalGeographicUK.us" site_id="hsr4">National Geographic UK</channel>
-    <channel lang="en" xmltv_id="NickelodeonEurope.us" site_id="hstc">Nickelodeon Europe</channel>
-    <channel lang="en" xmltv_id="NickJrUK.us" site_id="hstd">Nick Jr UK</channel>
-    <channel lang="en" xmltv_id="NickToonsUK.us" site_id="hss6">NickToons UK</channel>
+    <channel lang="en" xmltv_id="NickelodeonUK.uk" site_id="hstc">Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickJrUK.uk" site_id="hstd">Nick Jr UK</channel>
+    <channel lang="en" xmltv_id="NicktoonsUK.uk" site_id="hss6">NickToons UK</channel>
     <channel lang="en" xmltv_id="Now70s.uk" site_id="hs8r">Now 70&apos;s</channel>
     <channel lang="en" xmltv_id="Now80s.uk" site_id="hsxf">Now 80&apos;s</channel>
     <channel lang="en" xmltv_id="Now90s.uk" site_id="hs8t">Now 90&apos;s</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_bf.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_bf.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_bf.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_bf.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_bi.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_bi.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_bi.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_bi.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_bj.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_bj.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_bj.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_bj.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_cd.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_cd.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_cd.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_cd.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_cf.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_cf.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_cf.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_cf.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_cg.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_cg.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_cg.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_cg.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_ci.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_ci.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_ci.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_ci.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_cm.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_cm.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_cm.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_cm.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_cv.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_cv.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_cv.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_cv.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_dj.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_dj.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_dj.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_dj.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_ga.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_ga.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_ga.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_ga.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_gh.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_gh.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_gh.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_gh.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_gm.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_gm.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_gm.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_gm.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_gn.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_gn.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_gn.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_gn.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_gq.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_gq.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_gq.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_gq.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_gw.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_gw.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_gw.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_gw.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_ml.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_ml.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_ml.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_ml.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_mr.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_mr.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_mr.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_mr.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_ne.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_ne.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_ne.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_ne.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_rw.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_rw.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_rw.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_rw.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_sl.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_sl.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_sl.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_sl.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_sn.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_sn.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_sn.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_sn.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_td.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_td.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_td.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_td.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas TV</channel>
diff --git a/sites/canalplus-afrique.com/canalplus-afrique.com_tg.channels.xml b/sites/canalplus-afrique.com/canalplus-afrique.com_tg.channels.xml
index e670c4fb..da56a868 100644
--- a/sites/canalplus-afrique.com/canalplus-afrique.com_tg.channels.xml
+++ b/sites/canalplus-afrique.com/canalplus-afrique.com_tg.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="80223">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NBATV.us" site_id="80555">NBA TV</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="80307">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="80224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="80941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="80224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="80941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="80270">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NollywoodTVEpic.fr" site_id="80600">Nollywood TV Épic</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="80971">Novelas 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 522569e9..aaee195e 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml
@@ -78,8 +78,8 @@
     <channel lang="fr" xmltv_id="MTVHitsFrance.us" site_id="50147">MTV Hits France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="50145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="50223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="50224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="50941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="50224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="50941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="50418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="50548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="50216">NRJ 12</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 522569e9..aaee195e 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gf.channels.xml
@@ -78,8 +78,8 @@
     <channel lang="fr" xmltv_id="MTVHitsFrance.us" site_id="50147">MTV Hits France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="50145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="50223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="50224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="50941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="50224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="50941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="50418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="50548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="50216">NRJ 12</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 522569e9..aaee195e 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_gp.channels.xml
@@ -78,8 +78,8 @@
     <channel lang="fr" xmltv_id="MTVHitsFrance.us" site_id="50147">MTV Hits France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="50145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="50223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="50224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="50941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="50224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="50941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="50418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="50548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="50216">NRJ 12</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 522569e9..aaee195e 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mf.channels.xml
@@ -78,8 +78,8 @@
     <channel lang="fr" xmltv_id="MTVHitsFrance.us" site_id="50147">MTV Hits France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="50145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="50223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="50224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="50941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="50224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="50941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="50418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="50548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="50216">NRJ 12</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 522569e9..aaee195e 100644
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com_mq.channels.xml
@@ -78,8 +78,8 @@
     <channel lang="fr" xmltv_id="MTVHitsFrance.us" site_id="50147">MTV Hits France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="50145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="50223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="50224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="50941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="50224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="50941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="50418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="50548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="50216">NRJ 12</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 39e19b4a..3ee42973 100644
--- a/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
+++ b/sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
@@ -70,8 +70,8 @@
     <channel lang="fr" xmltv_id="NathanTV.fr" site_id="51959">Nathan TV</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="51145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="51223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="51224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickJrAfrica.us" site_id="51941">Nick Jr Africa</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="51224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickJrAfrica.za" site_id="51941">Nick Jr Africa</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="51418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="51548">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="51216">NRJ 12</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 e2d7d68a..59352af1 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml
@@ -70,8 +70,8 @@
     <channel lang="fr" xmltv_id="MTVIndia.us" site_id="60342">MTV India</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="60145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="60223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="60224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="60941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="60224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="60941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="60418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="Novegasy.mg" site_id="60799">Novegasy</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="60547">Novelas TV</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 e2d7d68a..59352af1 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_re.channels.xml
@@ -70,8 +70,8 @@
     <channel lang="fr" xmltv_id="MTVIndia.us" site_id="60342">MTV India</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="60145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="60223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="60224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="60941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="60224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="60941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="60418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="Novegasy.mg" site_id="60799">Novegasy</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="60547">Novelas TV</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 e2d7d68a..59352af1 100644
--- a/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com_yt.channels.xml
@@ -70,8 +70,8 @@
     <channel lang="fr" xmltv_id="MTVIndia.us" site_id="60342">MTV India</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="60145">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="60223">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="60224">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="60941">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="60224">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="60941">Nickelodeon Junior France</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="60418">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="Novegasy.mg" site_id="60799">Novegasy</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="60547">Novelas TV</channel>
diff --git a/sites/canalplus.com/canalplus.com_fr.channels.xml b/sites/canalplus.com/canalplus.com_fr.channels.xml
index 129bcecd..a202ff6e 100644
--- a/sites/canalplus.com/canalplus.com_fr.channels.xml
+++ b/sites/canalplus.com/canalplus.com_fr.channels.xml
@@ -154,9 +154,9 @@
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="302">NATIONAL GEO</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="290">NATIONAL GEOGRAPHIC WILD</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="654">NHK WORLD-JAPAN</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="591">NICKELODEON</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="593">NICKELODEON JUNIOR</channel>
-    <channel lang="fr" xmltv_id="NickelodeonTeen.us" site_id="518">NICKELODEON TEEN</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="591">NICKELODEON</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="593">NICKELODEON JUNIOR</channel>
+    <channel lang="fr" xmltv_id="NickelodeonTeen.fr" site_id="518">NICKELODEON TEEN</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="527">NOLLYWOOD TV</channel>
     <channel lang="fr" xmltv_id="NonStopPeopleFrance.fr" site_id="434">NON STOP PEOPLE</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="693">NOVELAS 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 2c2f510d..c450c111 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
@@ -130,10 +130,10 @@
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="508">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="719">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NHKWorldJapan.jp" site_id="830">NHK World Japan</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="473">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="473">Nickelodeon France</channel>
     <channel lang="fr" xmltv_id="NickelodeonFrancePlus1.us" site_id="2065">Nickelodeon France +1</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="888">Nickelodeon Junior France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonTeen.us" site_id="1746">Nickelodeon Teen</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="888">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonTeen.fr" site_id="1746">Nickelodeon Teen</channel>
     <channel lang="fr" xmltv_id="NitroGermany.de" site_id="2311">Nitro Deutschland</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="1461">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="1832">Novelas TV</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index 32e7dca6..7adef947 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="en" xmltv_id="MyxPhilippines.ph" site_id="myx">MYX</channel>
     <channel lang="en" xmltv_id="NationalGeographicPhilippines.us" site_id="national-geographic">National Geographic</channel>
     <channel lang="en" xmltv_id="Net25.ph" site_id="net-25">Net 25</channel>
-    <channel lang="en" xmltv_id="NickelodeonPhilippines.us" site_id="nickelodeon">Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickelodeonPhilippines.ph" site_id="nickelodeon">Nickelodeon</channel>
     <channel lang="en" xmltv_id="PBO.ph" site_id="pbo">PBO</channel>
     <channel lang="en" xmltv_id="PTV.ph" site_id="ptv">PTV</channel>
     <channel lang="en" xmltv_id="RockEntertainment.sg" site_id="rock-entertainment">Rock Entertainment</channel>
diff --git a/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
index 8892560e..2e696d6a 100644
--- a/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
+++ b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
@@ -48,7 +48,7 @@
     <channel lang="es" xmltv_id="MTVLatinoNorte.us" site_id="MTV">MTV Latino Norte</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="NatGeo Kids">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicSur.us" site_id="Nathional Geografic">National Geographic Sur</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="Nickelodeom">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="Nickelodeom">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="PAT.bo" site_id="P.A.T. (42)">PAT</channel>
     <channel lang="es" xmltv_id="RecordTVAmericas.br" site_id="Record">Record TV Américas</channel>
     <channel lang="es" xmltv_id="RedUno.bo" site_id="Red Uno (9)">Red Uno</channel>
diff --git a/sites/delta.nl/delta.nl_nl.channels.xml b/sites/delta.nl/delta.nl_nl.channels.xml
index c61d5ba4..f12402ea 100644
--- a/sites/delta.nl/delta.nl_nl.channels.xml
+++ b/sites/delta.nl/delta.nl_nl.channels.xml
@@ -113,10 +113,10 @@
     <channel lang="nl" xmltv_id="Net5.nl" site_id="9">Net 5</channel>
     <channel lang="nl" xmltv_id="NHKWorldJapan.jp" site_id="3126">NHK World Japan</channel>
     <channel lang="nl" xmltv_id="NHTV.nl" site_id="3095">NH TV</channel>
-    <channel lang="nl" xmltv_id="NickelodeonNederlandBelgie.us" site_id="42">Nickelodeon Nederland &amp; België</channel>
-    <channel lang="nl" xmltv_id="NickJrCentralEasternEurope.us" site_id="40">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="nl" xmltv_id="NickMusic.us" site_id="37">NickMusic</channel>
-    <channel lang="nl" xmltv_id="NickToonsUK.us" site_id="41">NickToons UK</channel>
+    <channel lang="nl" xmltv_id="NickelodeonNetherlands.nl" site_id="42">Nickelodeon</channel>
+    <channel lang="nl" xmltv_id="NickJrNetherlands.nl" site_id="40">Nick Jr</channel>
+    <channel lang="nl" xmltv_id="NickMusicNetherlands.nl" site_id="37">NickMusic</channel>
+    <channel lang="nl" xmltv_id="NicktoonsNetherlands.nl" site_id="41">Nicktoons</channel>
     <channel lang="nl" xmltv_id="NOOSTV.nl" site_id="3062">NOOS TV</channel>
     <channel lang="nl" xmltv_id="NPO1.nl" site_id="1">NPO 1</channel>
     <channel lang="nl" xmltv_id="NPO1Extra.nl" site_id="25">NPO 1 Extra</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 56689e67..bab8f9a8 100644
--- a/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
+++ b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
@@ -81,9 +81,8 @@
     <channel lang="tr" xmltv_id="MTVLive.us" site_id="322">MTV Live</channel>
     <channel lang="tr" xmltv_id="NationalGeographicTurkey.us" site_id="214">National Geographic Türkiye</channel>
     <channel lang="tr" xmltv_id="NationalGeographicWildTurkey.us" site_id="179">National Geographic Wild Türkiye</channel>
-    <channel lang="tr" xmltv_id="NickelodeonHD.us" site_id="351">Nickelodeon HD</channel>
-    <channel lang="tr" xmltv_id="NickelodeonTurkey.us" site_id="189">Nickelodeon Türkiye</channel>
-    <channel lang="tr" xmltv_id="NickJrTurkey.us" site_id="321">Nick Jr Türkiye</channel>
+    <channel lang="tr" xmltv_id="NickelodeonTurkey.tr" site_id="189">Nickelodeon Türkiye</channel>
+    <channel lang="tr" xmltv_id="NickJrTurkey.tr" site_id="321">Nick Jr Türkiye</channel>
     <channel lang="tr" xmltv_id="NTV.tr" site_id="28">NTV</channel>
     <channel lang="tr" xmltv_id="QuranTV.sa" site_id="477">Quran TV</channel>
     <channel lang="tr" xmltv_id="Rai1.it" site_id="85">Rai 1</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index 0fd25712..4499bf8e 100644
--- a/sites/directv.com/directv.com_us.channels.xml
+++ b/sites/directv.com/directv.com_us.channels.xml
@@ -230,10 +230,10 @@
     <channel lang="en" xmltv_id="NESN.us" site_id="628">NESN</channel>
     <channel lang="en" xmltv_id="NewsmaxTV.us" site_id="349">Newsmax TV</channel>
     <channel lang="en" xmltv_id="NewsNationEast.us" site_id="307">NewsNation East</channel>
-    <channel lang="en" xmltv_id="NickelodeonEast.us" site_id="299">Nickelodeon East</channel>
-    <channel lang="en" xmltv_id="NickelodeonWest.us" site_id="300">Nickelodeon West</channel>
-    <channel lang="en" xmltv_id="NickJrEast.us" site_id="301">Nick Jr East</channel>
-    <channel lang="en" xmltv_id="NicktoonsEast.us" site_id="302">Nicktoons East</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSEast.us" site_id="299">Nickelodeon East</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSWest.us" site_id="300">Nickelodeon West</channel>
+    <channel lang="en" xmltv_id="NickJrUSEast.us" site_id="301">Nick Jr East</channel>
+    <channel lang="en" xmltv_id="NicktoonsUSEast.us" site_id="302">Nicktoons East</channel>
     <channel lang="en" xmltv_id="NipponTV.jp" site_id="2041">Nippon TV</channel>
     <channel lang="en" xmltv_id="NRBTV.us" site_id="378">NRB TV</channel>
     <channel lang="en" xmltv_id="NTN24USA.co" site_id="418">NTN 24 USA</channel>
@@ -324,7 +324,7 @@
     <channel lang="en" xmltv_id="TBSEast.us" site_id="247">TBS East</channel>
     <channel lang="en" xmltv_id="TCMUS.us" site_id="256">TCM US</channel>
     <channel lang="en" xmltv_id="TCT.us" site_id="377">TCT</channel>
-    <channel lang="en" xmltv_id="TeenNickEast.us" site_id="303">TeenNick East</channel>
+    <channel lang="en" xmltv_id="TeenNickUSEast.us" site_id="303">TeenNick East</channel>
     <channel lang="en" xmltv_id="TeleCentro.us" site_id="429">TeleCentro</channel>
     <channel lang="en" xmltv_id="TelefeInternacional.ar" site_id="411">Telefe Internacional</channel>
     <channel lang="en" xmltv_id="TelemundoEast.us" site_id="406">Telemundo Este</channel>
diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index aa79f411..f1a082e7 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -189,9 +189,9 @@
     <channel lang="en" xmltv_id="NewsNation.in" site_id="10000000010620000">News Nation</channel>
     <channel lang="en" xmltv_id="NewsStateUPUK.in" site_id="10000000021290000">News State UP &amp; UK</channel>
     <channel lang="en" xmltv_id="NewsTimeBangla.in" site_id="10000000004360000">NewsTime Bangla</channel>
-    <channel lang="en" xmltv_id="NickelodeonIndia.us" site_id="10000000001010000">Nickelodeon India</channel>
-    <channel lang="en" xmltv_id="NickHDPlus.us" site_id="10000000039210000">Nick HD+</channel>
-    <channel lang="en" xmltv_id="NickJrIndia.us" site_id="10000000013230000">Nick Jr India</channel>
+    <channel lang="en" xmltv_id="NickelodeonIndia.in" site_id="10000000001010000">Nickelodeon India</channel>
+    <channel lang="en" xmltv_id="NickHDPlus.in" site_id="10000000039210000">Nick HD+</channel>
+    <channel lang="en" xmltv_id="NickJrIndia.in" site_id="10000000013230000">Nick Jr India</channel>
     <channel lang="en" xmltv_id="OdishaTV.in" site_id="10000000003380000">Odisha TV</channel>
     <channel lang="en" xmltv_id="ParasGold.in" site_id="10000000006790000">Paras Gold</channel>
     <channel lang="en" xmltv_id="PeaceofMindTV.in" site_id="10000000011140000">Peace of Mind TV</channel>
@@ -232,7 +232,7 @@
     <channel lang="en" xmltv_id="ShemarooTV.in" site_id="10000000073540000">Shemaroo TV</channel>
     <channel lang="en" xmltv_id="ShubhTV.in" site_id="10000000041760000">Shubh TV</channel>
     <channel lang="en" xmltv_id="SongdewTV.in" site_id="10000000063850000">Songdew TV</channel>
-    <channel lang="en" xmltv_id="SonicNickelodeon.us" site_id="10000000007610000">Sonic Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickelodeonSonic.in" site_id="10000000007610000">Sonic Nickelodeon</channel>
     <channel lang="en" xmltv_id="SonyAath.in" site_id="10000000004390000">Sony Aath</channel>
     <channel lang="en" xmltv_id="SonyBBCEarth.uk" site_id="10000000050940000">Sony BBC Earth</channel>
     <channel lang="en" xmltv_id="SonyMarathi.in" site_id="10000000060520000">Sony Marathi</channel>
diff --git a/sites/dstv.com/dstv.com_ng.channels.xml b/sites/dstv.com/dstv.com_ng.channels.xml
index 35e8fb53..7015cfbb 100644
--- a/sites/dstv.com/dstv.com_ng.channels.xml
+++ b/sites/dstv.com/dstv.com_ng.channels.xml
@@ -86,9 +86,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="nga#413">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="nga#405">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="nga#431">NHK</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="nga#305">Nickelodeon</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="nga#307">NickJr</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="nga#308">NickTOONS</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="nga#305">Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="nga#307">NickJr</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="nga#308">NickTOONS</channel>
     <channel lang="en" xmltv_id="NTA2.ng" site_id="nga#369">NTA 2</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="nga#251">NTA I</channel>
     <channel lang="en" xmltv_id="NTANews24.ng" site_id="nga#419">NTA News 24</channel>
diff --git a/sites/dstv.com/dstv.com_za.channels.xml b/sites/dstv.com/dstv.com_za.channels.xml
index f7512cc2..7061aa5a 100644
--- a/sites/dstv.com/dstv.com_za.channels.xml
+++ b/sites/dstv.com/dstv.com_za.channels.xml
@@ -86,9 +86,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="zaf#182">NatGeo Wild</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="zaf#413">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="zaf#405">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="zaf#305">Nickelodeon</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="zaf#307">NickJr</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="zaf#308">NickTOONS</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="zaf#305">Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="zaf#307">NickJr</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="zaf#308">NickTOONS</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="zaf#299">NTA I</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="zaf#331">One Gospel</channel>
     <channel lang="en" xmltv_id="ParliamentTV.za" site_id="zaf#408">Parliamentary Service</channel>
diff --git a/sites/gatotv.com/gatotv.com_cl.channels.xml b/sites/gatotv.com/gatotv.com_cl.channels.xml
index 343c739a..a691a5fe 100644
--- a/sites/gatotv.com/gatotv.com_cl.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cl.channels.xml
@@ -33,7 +33,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_chile">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_chile">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_chile">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_chile">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_chile">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_jr_chile">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_chile">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_chile">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_co.channels.xml b/sites/gatotv.com/gatotv.com_co.channels.xml
index 6ec67fcc..63cfaf39 100644
--- a/sites/gatotv.com/gatotv.com_co.channels.xml
+++ b/sites/gatotv.com/gatotv.com_co.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="es" xmltv_id="LifetimeLatinAmerica.us" site_id="lifetime_colombia">Lifetime Latinoamérica</channel>
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_colombia">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_colombia">Nat Geo Kids</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_colombia">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_colombia">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_colombia">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="NTN24.co" site_id="ntn24_nuestra_tele_noticias">NTN 24</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_colombia">Paramount Network Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_cr.channels.xml b/sites/gatotv.com/gatotv.com_cr.channels.xml
index a8fdc161..9cd9ca9b 100644
--- a/sites/gatotv.com/gatotv.com_cr.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cr.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_costa_rica">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_costa_rica">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_costa_rica">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_costa_rica">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_costa_rica">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_costa_rica">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_costa_rica">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_costa_rica">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_do.channels.xml b/sites/gatotv.com/gatotv.com_do.channels.xml
index 52061ae9..a2229c1a 100644
--- a/sites/gatotv.com/gatotv.com_do.channels.xml
+++ b/sites/gatotv.com/gatotv.com_do.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_republica_dominicana">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_republica_dominicana">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_republica_dominicana">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_republica_dominicana">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_republica_dominicana">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_republica_dominicana">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_republica_dominicana">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_republica_dominicana">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_ec.channels.xml b/sites/gatotv.com/gatotv.com_ec.channels.xml
index 6bf3d5a9..10786f13 100644
--- a/sites/gatotv.com/gatotv.com_ec.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ec.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="es" xmltv_id="LifetimeLatinAmerica.us" site_id="lifetime_ecuador">Lifetime Latinoamérica</channel>
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_ecuador">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_ecuador">Nat Geo Kids</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_ecuador">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_ecuador">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_ecuador">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_ecuador">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SpaceSur.ar" site_id="space_ecuador">Space Sur</channel>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index 79d05327..9ace10e2 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -40,8 +40,8 @@
     <channel lang="es" xmltv_id="MTVSpain.us" site_id="mtv_espana">MTV España</channel>
     <channel lang="es" xmltv_id="NationalGeographicSpain.us" site_id="national_geographic_espana">National Geographic España</channel>
     <channel lang="es" xmltv_id="Neox.es" site_id="neox">Neox</channel>
-    <channel lang="es" xmltv_id="NickelodeonIberia.us" site_id="nickelodeon_espana">Nickelodeon Iberia</channel>
-    <channel lang="es" xmltv_id="NickJrEurope.us" site_id="nick_junior_espana">Nick Jr Europe</channel>
+    <channel lang="es" xmltv_id="NickelodeonSpain.es" site_id="nickelodeon_espana">Nickelodeon</channel>
+    <channel lang="es" xmltv_id="NickJrSpain.es" site_id="nick_junior_espana">Nick Jr</channel>
     <channel lang="es" xmltv_id="Nova.es" site_id="nova">Nova</channel>
     <channel lang="es" xmltv_id="Odisea.es" site_id="odisea">Odisea</channel>
     <channel lang="es" xmltv_id="ParamountChannelSpain.us" site_id="paramount_channel_espana">Paramount Channel España</channel>
diff --git a/sites/gatotv.com/gatotv.com_gt.channels.xml b/sites/gatotv.com/gatotv.com_gt.channels.xml
index 670d6ecd..6853b49b 100644
--- a/sites/gatotv.com/gatotv.com_gt.channels.xml
+++ b/sites/gatotv.com/gatotv.com_gt.channels.xml
@@ -32,7 +32,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_guatemala">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_guatemala">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_guatemala">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_guatemala">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_guatemala">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_guatemala">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_guatemala">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_guatemala">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_hn.channels.xml b/sites/gatotv.com/gatotv.com_hn.channels.xml
index d31c946d..f8ab495c 100644
--- a/sites/gatotv.com/gatotv.com_hn.channels.xml
+++ b/sites/gatotv.com/gatotv.com_hn.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_honduras">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_honduras">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_honduras">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_honduras">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_honduras">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_honduras">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_honduras">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_honduras">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_mx.channels.xml b/sites/gatotv.com/gatotv.com_mx.channels.xml
index 3d0a4786..d3396721 100644
--- a/sites/gatotv.com/gatotv.com_mx.channels.xml
+++ b/sites/gatotv.com/gatotv.com_mx.channels.xml
@@ -72,7 +72,7 @@
     <channel lang="es" xmltv_id="MultimediosPlus.mx" site_id="multimedios_plus">Multimedios Plus</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_mexico">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicNorte.us" site_id="national_geographic_mexico">National Geographic Norte</channel>
-    <channel lang="es" xmltv_id="NickelodeonNorte.us" site_id="nickelodeon_mexico">Nickelodeon Norte</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_mexico">Nickelodeon Mexico</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_mexico">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="Nueve.mx" site_id="9_de_mexico">Nueve</channel>
     <channel lang="es" xmltv_id="OnceMexico.mx" site_id="11_de_mexico">Once México</channel>
diff --git a/sites/gatotv.com/gatotv.com_ni.channels.xml b/sites/gatotv.com/gatotv.com_ni.channels.xml
index efb5a1cb..b632a3f3 100644
--- a/sites/gatotv.com/gatotv.com_ni.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ni.channels.xml
@@ -31,7 +31,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_nicaragua">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_nicaragua">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_nicaragua">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_nicaragua">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_nicaragua">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_nicaragua">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_nicaragua">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_nicaragua">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_pa.channels.xml b/sites/gatotv.com/gatotv.com_pa.channels.xml
index c7982baf..9e5906d2 100644
--- a/sites/gatotv.com/gatotv.com_pa.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pa.channels.xml
@@ -31,7 +31,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_panama">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_panama">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_panama">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_panama">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_panama">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_panama">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_panama">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="RPCTV.pa" site_id="4_de_panama">RPC TV</channel>
diff --git a/sites/gatotv.com/gatotv.com_pe.channels.xml b/sites/gatotv.com/gatotv.com_pe.channels.xml
index 43cff378..8bd9db2f 100644
--- a/sites/gatotv.com/gatotv.com_pe.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pe.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="es" xmltv_id="LifetimeLatinAmerica.us" site_id="lifetime_peru">Lifetime Latinoamérica</channel>
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_peru">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_peru">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_peru">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_peru">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_jr_peru">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="PanamericanaTV.pe" site_id="panamericana_television">Panamericana TV</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_peru">Paramount Network Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_sv.channels.xml b/sites/gatotv.com/gatotv.com_sv.channels.xml
index eccc1207..922f3de1 100644
--- a/sites/gatotv.com/gatotv.com_sv.channels.xml
+++ b/sites/gatotv.com/gatotv.com_sv.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_el_salvador">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="nat_geo_kids_el_salvador">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_el_salvador">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_el_salvador">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_el_salvador">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_junior_el_salvador">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_el_salvador">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_el_salvador">Sony Channel Andes</channel>
diff --git a/sites/gatotv.com/gatotv.com_ve.channels.xml b/sites/gatotv.com/gatotv.com_ve.channels.xml
index d1309d18..09abc317 100644
--- a/sites/gatotv.com/gatotv.com_ve.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ve.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="es" xmltv_id="LifetimeLatinAmerica.us" site_id="lifetime_venezuela">Lifetime Latinoamérica</channel>
     <channel lang="es" xmltv_id="MTVLatinoSud.us" site_id="mtv_venezuela">MTV Latino Sud</channel>
     <channel lang="es" xmltv_id="NationalGeographicCentro.us" site_id="national_geographic_venezuela">National Geographic Centro</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="nickelodeon_venezuela">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="nickelodeon_venezuela">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="nick_jr_venezuela">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="paramount_channel_venezuela">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="SonyChannelAndes.us" site_id="sony_venezuela">Sony Channel Andes</channel>
diff --git a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
index d140813e..d3107c8f 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -67,10 +67,10 @@
     <channel lang="it" xmltv_id="NationalGeographicItalia.us" site_id="DTH#9098">National Geographic Italia</channel>
     <channel lang="it" xmltv_id="NationalGeographicItaliaPlus1.us" site_id="DTH#125">National Geographic Italia +1</channel>
     <channel lang="it" xmltv_id="NationalGeographicWildItalia.us" site_id="DTH#9100">National Geographic Wild Italia</channel>
-    <channel lang="it" xmltv_id="NickelodeonItalia.us" site_id="DTH#320">Nickelodeon Italia</channel>
-    <channel lang="it" xmltv_id="NickelodeonItaliaPlus1.us" site_id="DTH#6140">Nickelodeon Italia +1</channel>
-    <channel lang="it" xmltv_id="NickJrItalia.us" site_id="DTH#461">Nick Jr Italia</channel>
-    <channel lang="it" xmltv_id="NickJrItaliaPlus1.us" site_id="DTH#6701">Nick Jr Italia +1</channel>
+    <channel lang="it" xmltv_id="NickelodeonItalia.it" site_id="DTH#320">Nickelodeon Italia</channel>
+    <channel lang="it" xmltv_id="NickelodeonItaliaPlus1.it" site_id="DTH#6140">Nickelodeon Italia +1</channel>
+    <channel lang="it" xmltv_id="NickJrItalia.it" site_id="DTH#461">Nick Jr Italia</channel>
+    <channel lang="it" xmltv_id="NickJrItaliaPlus1.it" site_id="DTH#6701">Nick Jr Italia +1</channel>
     <channel lang="it" xmltv_id="Nove.it" site_id="DTH#9753">Nove</channel>
     <channel lang="it" xmltv_id="ParamountNetworkItalia.us" site_id="DTH#10914">Paramount Network Italia</channel>
     <channel lang="it" xmltv_id="Pesca.it" site_id="DTH#6220">Pesca</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_bf.channels.xml b/sites/guide.dstv.com/guide.dstv.com_bf.channels.xml
index 857133ee..369b11c9 100644
--- a/sites/guide.dstv.com/guide.dstv.com_bf.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_bf.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="b8a3d100-6a41-468f-b6df-14e0ce526be6#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_bi.channels.xml b/sites/guide.dstv.com/guide.dstv.com_bi.channels.xml
index feb9eacc..6b17f7bd 100644
--- a/sites/guide.dstv.com/guide.dstv.com_bi.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_bi.channels.xml
@@ -74,9 +74,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="fa5b7f92-9561-4312-832f-759a65e8e10f#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_bj.channels.xml b/sites/guide.dstv.com/guide.dstv.com_bj.channels.xml
index a6292466..b8bb03b5 100644
--- a/sites/guide.dstv.com/guide.dstv.com_bj.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_bj.channels.xml
@@ -75,9 +75,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="13727be9-2f31-43aa-9511-41b20f94b810#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="13727be9-2f31-43aa-9511-41b20f94b810#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_bw.channels.xml b/sites/guide.dstv.com/guide.dstv.com_bw.channels.xml
index d086e797..0e6c4fe2 100644
--- a/sites/guide.dstv.com/guide.dstv.com_bw.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_bw.channels.xml
@@ -75,9 +75,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="f039b135-2944-423c-80d9-4e6fd3add524#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="NowTV.bw" site_id="f039b135-2944-423c-80d9-4e6fd3add524#NTV">Now! TV</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="f039b135-2944-423c-80d9-4e6fd3add524#GOS">One Gospel</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_cd.channels.xml b/sites/guide.dstv.com/guide.dstv.com_cd.channels.xml
index fec7876f..0cd1ac5e 100644
--- a/sites/guide.dstv.com/guide.dstv.com_cd.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_cd.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="13517260-207c-4049-928f-fe4776d3d4f5#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="13517260-207c-4049-928f-fe4776d3d4f5#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="13517260-207c-4049-928f-fe4776d3d4f5#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_cf.channels.xml b/sites/guide.dstv.com/guide.dstv.com_cf.channels.xml
index 4e63b079..562e4862 100644
--- a/sites/guide.dstv.com/guide.dstv.com_cf.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_cf.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="5b4c4ef0-ec6f-4e35-b33a-8edbc1e0a276#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_cg.channels.xml b/sites/guide.dstv.com/guide.dstv.com_cg.channels.xml
index 0e5190ff..4f623f1d 100644
--- a/sites/guide.dstv.com/guide.dstv.com_cg.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_cg.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="d0916911-6af3-45c1-9290-bd879280a1f6#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ci.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ci.channels.xml
index 1b60cf95..7e4e9846 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ci.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ci.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="b87a349c-d17d-43da-b064-0b9fdc2481c2#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_cm.channels.xml b/sites/guide.dstv.com/guide.dstv.com_cm.channels.xml
index b7aab46e..23d84ba8 100644
--- a/sites/guide.dstv.com/guide.dstv.com_cm.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_cm.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="82b66ecd-8ac3-4ce4-81e8-539adb9f9e39#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_cv.channels.xml b/sites/guide.dstv.com/guide.dstv.com_cv.channels.xml
index e6cc95c1..a18f5762 100644
--- a/sites/guide.dstv.com/guide.dstv.com_cv.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_cv.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="93ec89e2-1ae0-4a28-997d-29eac2cdd0a4#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_dj.channels.xml b/sites/guide.dstv.com/guide.dstv.com_dj.channels.xml
index 745307e8..6e69db76 100644
--- a/sites/guide.dstv.com/guide.dstv.com_dj.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_dj.channels.xml
@@ -68,9 +68,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="f4279526-2275-4cbd-9b9d-cf187b69d8a2#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_er.channels.xml b/sites/guide.dstv.com/guide.dstv.com_er.channels.xml
index e51d984c..b8be4858 100644
--- a/sites/guide.dstv.com/guide.dstv.com_er.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_er.channels.xml
@@ -70,9 +70,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_et.channels.xml b/sites/guide.dstv.com/guide.dstv.com_et.channels.xml
index 4a625962..b74fd8b8 100644
--- a/sites/guide.dstv.com/guide.dstv.com_et.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_et.channels.xml
@@ -85,9 +85,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="OBN.et" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#OB7">OBN</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="424b72cb-7a90-4a57-aa26-420aaae14cda#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ga.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ga.channels.xml
index 42551d14..82eea75b 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ga.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ga.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="feacab2d-c625-40f4-859f-cdff1669879b#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="feacab2d-c625-40f4-859f-cdff1669879b#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="feacab2d-c625-40f4-859f-cdff1669879b#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_gh.channels.xml b/sites/guide.dstv.com/guide.dstv.com_gh.channels.xml
index 0620de95..2a92586f 100644
--- a/sites/guide.dstv.com/guide.dstv.com_gh.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_gh.channels.xml
@@ -80,9 +80,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_gm.channels.xml b/sites/guide.dstv.com/guide.dstv.com_gm.channels.xml
index 5328f7ec..ec7b24e1 100644
--- a/sites/guide.dstv.com/guide.dstv.com_gm.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_gm.channels.xml
@@ -71,9 +71,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="582cc437-a527-417e-a46b-00b3d7e24731#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="582cc437-a527-417e-a46b-00b3d7e24731#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="582cc437-a527-417e-a46b-00b3d7e24731#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_gn.channels.xml b/sites/guide.dstv.com/guide.dstv.com_gn.channels.xml
index bf918d9d..10a8d295 100644
--- a/sites/guide.dstv.com/guide.dstv.com_gn.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_gn.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="c9f9cf16-b13b-407c-a26f-33a2197047fb#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_gq.channels.xml b/sites/guide.dstv.com/guide.dstv.com_gq.channels.xml
index ffc8c16e..14155a81 100644
--- a/sites/guide.dstv.com/guide.dstv.com_gq.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_gq.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="346b8ed1-6c8b-4858-986c-318fa058caeb#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_gw.channels.xml b/sites/guide.dstv.com/guide.dstv.com_gw.channels.xml
index 4f8351e2..1caa593c 100644
--- a/sites/guide.dstv.com/guide.dstv.com_gw.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_gw.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="2a4e2521-b7da-488e-af7d-e4d87fd5d132#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ke.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ke.channels.xml
index c7990dca..aef973c7 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ke.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ke.channels.xml
@@ -87,9 +87,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTV.ke" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NTS">NTV</channel>
     <channel lang="en" xmltv_id="NTVUganda.ke" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#NAS">NTV Uganda</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_lr.channels.xml b/sites/guide.dstv.com/guide.dstv.com_lr.channels.xml
index 43aacbb3..2309c276 100644
--- a/sites/guide.dstv.com/guide.dstv.com_lr.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_lr.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="d7923285-81d0-4d1b-8084-4fea99e1e79c#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ls.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ls.channels.xml
index 873285f5..5bf69c2d 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ls.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ls.channels.xml
@@ -84,9 +84,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NIC">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NIC">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTA">NTA International</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#GOS">One Gospel</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_mg.channels.xml b/sites/guide.dstv.com/guide.dstv.com_mg.channels.xml
index 009e7159..8fb8e268 100644
--- a/sites/guide.dstv.com/guide.dstv.com_mg.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_mg.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="852098e9-d1d9-41fa-936b-4bf3a9570ac4#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ml.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ml.channels.xml
index ad7a9fc4..65a25b14 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ml.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ml.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="33a4787d-2dec-4d07-b1de-c5ac51cfcd28#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_mr.channels.xml b/sites/guide.dstv.com/guide.dstv.com_mr.channels.xml
index 02449afa..0724ad7f 100644
--- a/sites/guide.dstv.com/guide.dstv.com_mr.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_mr.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="a8f3a4d4-c9c8-4cba-84f1-686e16cf7f2b#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_mu.channels.xml b/sites/guide.dstv.com/guide.dstv.com_mu.channels.xml
index 24139e99..505f8353 100644
--- a/sites/guide.dstv.com/guide.dstv.com_mu.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_mu.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="af142b93-a5dd-4271-95fa-3a14fd33cdec#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_mw.channels.xml b/sites/guide.dstv.com/guide.dstv.com_mw.channels.xml
index 6db11447..36e8de1c 100644
--- a/sites/guide.dstv.com/guide.dstv.com_mw.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_mw.channels.xml
@@ -76,9 +76,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#GOS">One Gospel</channel>
     <channel lang="en" xmltv_id="OneZed.za" site_id="eddee4b5-ecfc-41e7-a8c0-8e2978506b33#ZZ4">OneZed</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_na.channels.xml b/sites/guide.dstv.com/guide.dstv.com_na.channels.xml
index 30641f30..8ee6d1ea 100644
--- a/sites/guide.dstv.com/guide.dstv.com_na.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_na.channels.xml
@@ -75,9 +75,9 @@
     <channel lang="en" xmltv_id="NBC2.na" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#TS7">NBC 2</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="OneAfricaTV.na" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#1AF">One Africa TV</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="942aeed1-ebd7-4396-ae8e-d24383d9831b#GOS">One Gospel</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ne.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ne.channels.xml
index f24dd164..d1010e76 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ne.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ne.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="d916ff01-7ce8-4798-8723-cdf7d195d5c8#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ng.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ng.channels.xml
index a326ec5c..21796b8d 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ng.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ng.channels.xml
@@ -81,9 +81,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTA2.ng" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NE7">NTA 2</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="b8ff3564-52dc-40c3-a465-e8661d4e96cd#NTW">NTA International</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_rw.channels.xml b/sites/guide.dstv.com/guide.dstv.com_rw.channels.xml
index bc2b73b5..fd95cda8 100644
--- a/sites/guide.dstv.com/guide.dstv.com_rw.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_rw.channels.xml
@@ -75,9 +75,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTV.ke" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NTS">NTV</channel>
     <channel lang="en" xmltv_id="NTVUganda.ke" site_id="4cc9ec84-107d-49f8-bc5d-535c993052af#NAS">NTV Uganda</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_sc.channels.xml b/sites/guide.dstv.com/guide.dstv.com_sc.channels.xml
index 3669744b..b8bc0706 100644
--- a/sites/guide.dstv.com/guide.dstv.com_sc.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_sc.channels.xml
@@ -71,9 +71,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="e7dbff82-4a96-4356-8408-3ff334f68e3d#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_sd.channels.xml b/sites/guide.dstv.com/guide.dstv.com_sd.channels.xml
index 075acc10..224f13c5 100644
--- a/sites/guide.dstv.com/guide.dstv.com_sd.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_sd.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="1e20c88f-9fc8-4e79-bee5-1ead9d43c7a2#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_sl.channels.xml b/sites/guide.dstv.com/guide.dstv.com_sl.channels.xml
index 718e59af..ef5bfaed 100644
--- a/sites/guide.dstv.com/guide.dstv.com_sl.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_sl.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="f3a411da-47ae-4362-bb30-ed429281db42#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="f3a411da-47ae-4362-bb30-ed429281db42#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="f3a411da-47ae-4362-bb30-ed429281db42#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_sn.channels.xml b/sites/guide.dstv.com/guide.dstv.com_sn.channels.xml
index 031c0ee7..c3ca55c5 100644
--- a/sites/guide.dstv.com/guide.dstv.com_sn.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_sn.channels.xml
@@ -72,9 +72,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="d8afc88a-d670-4133-bbc5-949ee754a0ab#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_so.channels.xml b/sites/guide.dstv.com/guide.dstv.com_so.channels.xml
index 1f617160..69f4532b 100644
--- a/sites/guide.dstv.com/guide.dstv.com_so.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_so.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#PB7">PBS Kids</channel>
     <channel lang="en" xmltv_id="PlusTVAfrica.ng" site_id="7566095e-df8e-4d5f-bfaf-101c8ca51a36#PTW">Plus TV Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ss.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ss.channels.xml
index 9f74b66e..a1da7ee3 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ss.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ss.channels.xml
@@ -70,9 +70,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTV.ke" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#NTS">NTV</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="82e81fba-917e-4d0a-9386-426cc4fa7194#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_st.channels.xml b/sites/guide.dstv.com/guide.dstv.com_st.channels.xml
index 5797b905..799826e2 100644
--- a/sites/guide.dstv.com/guide.dstv.com_st.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_st.channels.xml
@@ -73,9 +73,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="442fc9db-9419-49a0-8905-4e05ca78c48a#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_sz.channels.xml b/sites/guide.dstv.com/guide.dstv.com_sz.channels.xml
index 4033eb75..bdd6d6c3 100644
--- a/sites/guide.dstv.com/guide.dstv.com_sz.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_sz.channels.xml
@@ -74,9 +74,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#GOS">One Gospel</channel>
     <channel lang="en" xmltv_id="ParliamentTV.za" site_id="84dc4bdc-ab48-4ed2-a67d-1aaa0528bfac#PAR">Parliament TV</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_td.channels.xml b/sites/guide.dstv.com/guide.dstv.com_td.channels.xml
index 3ca9e76a..f03465da 100644
--- a/sites/guide.dstv.com/guide.dstv.com_td.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_td.channels.xml
@@ -70,9 +70,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="892ca9aa-b094-4cf5-9e3e-e597ac55dee2#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_tg.channels.xml b/sites/guide.dstv.com/guide.dstv.com_tg.channels.xml
index 086872cb..416e1027 100644
--- a/sites/guide.dstv.com/guide.dstv.com_tg.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_tg.channels.xml
@@ -82,9 +82,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#NTW">NTA International</channel>
     <channel lang="en" xmltv_id="PBSKids.us" site_id="a5bdd99e-a949-412a-b7e0-5abcbbf25b56#PB7">PBS Kids</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_tz.channels.xml b/sites/guide.dstv.com/guide.dstv.com_tz.channels.xml
index ee7096bf..bc357258 100644
--- a/sites/guide.dstv.com/guide.dstv.com_tz.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_tz.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="en" xmltv_id="KBCChannel1.ke" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#KBS">KBC Channel 1</channel>
     <channel lang="en" xmltv_id="MindsetLearn.za" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#ATW">Mindset Learn</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#NDW">NDTV 24x7</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#NIW">Nickelodeon Africa</channel>
     <channel lang="en" xmltv_id="RaiItaliaAfrica.it" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#RA4">Rai Italia Africa</channel>
     <channel lang="en" xmltv_id="RTPInternacionalEuropa.pt" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#RP4">RTP Internacional Europa</channel>
     <channel lang="en" xmltv_id="SoundcityAfrica.ng" site_id="fff8d4a6-ddfc-42a4-bc62-457f1e956563#MM2">Soundcity Africa</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_ug.channels.xml b/sites/guide.dstv.com/guide.dstv.com_ug.channels.xml
index 54f46f31..0f745f5a 100644
--- a/sites/guide.dstv.com/guide.dstv.com_ug.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_ug.channels.xml
@@ -86,9 +86,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NDW">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NRH">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NHW">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NIW">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NJW">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NT7">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NIW">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NJW">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NT7">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NM7">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTV.ke" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NTS">NTV</channel>
     <channel lang="en" xmltv_id="NTVUganda.ke" site_id="fdb2ab21-ca26-4adc-9a7f-313e71a12694#NAS">NTV Uganda</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_za.channels.xml b/sites/guide.dstv.com/guide.dstv.com_za.channels.xml
index 1b9c93f5..4a8b62f3 100644
--- a/sites/guide.dstv.com/guide.dstv.com_za.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_za.channels.xml
@@ -89,9 +89,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NZD">Newzroom Afrika</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NIC">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NIC">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="NTAInternational.ng" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#NTA">NTA International</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#GOS">One Gospel</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_zm.channels.xml b/sites/guide.dstv.com/guide.dstv.com_zm.channels.xml
index bbd74388..5ab4a2f0 100644
--- a/sites/guide.dstv.com/guide.dstv.com_zm.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_zm.channels.xml
@@ -77,9 +77,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#GOS">One Gospel</channel>
     <channel lang="en" xmltv_id="OneZed.za" site_id="19ac6d87-43ba-436f-b4d1-12f62fe7dad4#ZZ4">OneZed</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com_zw.channels.xml b/sites/guide.dstv.com/guide.dstv.com_zw.channels.xml
index e8cb7477..cbea7387 100644
--- a/sites/guide.dstv.com/guide.dstv.com_zw.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com_zw.channels.xml
@@ -74,9 +74,9 @@
     <channel lang="en" xmltv_id="NationalGeographicWildSouthAfrica.us" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NGW">National Geographic Wild South Africa</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#DEE">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NewzroomAfrika.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NZD">Newzroom Afrika</channel>
-    <channel lang="en" xmltv_id="NickelodeonAfrica.us" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NKA">Nickelodeon Africa</channel>
-    <channel lang="en" xmltv_id="NickJrAfrica.us" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NJR">Nick Jr Africa</channel>
-    <channel lang="en" xmltv_id="NickToonsAfrica.us" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NTO">NickToons Africa</channel>
+    <channel lang="en" xmltv_id="NickelodeonAfrica.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NKA">Nickelodeon Africa</channel>
+    <channel lang="en" xmltv_id="NickJrAfrica.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NJR">Nick Jr Africa</channel>
+    <channel lang="en" xmltv_id="NicktoonsAfrica.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#NTO">NickToons Africa</channel>
     <channel lang="en" xmltv_id="NovelaMagic.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#MST">Novela Magic</channel>
     <channel lang="en" xmltv_id="OneGospel.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#GOS">One Gospel</channel>
     <channel lang="en" xmltv_id="ParliamentTV.za" site_id="404a052b-3dea-4cac-a19c-de9a7d6f191d#PAR">Parliament TV</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index 1640fc22..9af6470b 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -110,8 +110,8 @@
     <channel lang="de" xmltv_id="NDRFernsehenNiedersachsen.de" site_id="NDR_FS_NDS">NDR FS NDS</channel>
     <channel lang="de" xmltv_id="NDRFernsehenSchleswigHolstein.de" site_id="NDR_FS_SH">NDR FS SH</channel>
     <channel lang="de" xmltv_id="NHKWorldJapan.jp" site_id="SV_09999_15125">NHK WORLD-JAPAN</channel>
-    <channel lang="de" xmltv_id="NickelodeonGermany.us" site_id="SV_09999_44106">Nick HD</channel>
-    <channel lang="de" xmltv_id="NickJrEurope.us" site_id="SV_00133_00138">Nick.Jr.</channel>
+    <channel lang="de" xmltv_id="NickGermany.de" site_id="SV_09999_44106">Nick HD</channel>
+    <channel lang="de" xmltv_id="NickJrGermany.de" site_id="SV_00133_00138">Nick.Jr.</channel>
     <channel lang="de" xmltv_id="NitroGermany.de" site_id="RTL_NITRO">Nitro</channel>
     <channel lang="de" xmltv_id="NPO2.nl" site_id="NED_2">Nederland 2</channel>
     <channel lang="de" xmltv_id="NRWision.de" site_id="SV_09999_53105">NRWision HD</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index a5167676..5845ef8d 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -263,10 +263,9 @@
     <channel lang="cz" xmltv_id="NauticalChannel.it" site_id="Nautical+Channel">Nautical Channel</channel>
     <channel lang="cz" xmltv_id="NBATV.us" site_id="NBA+SD">NBA TV</channel>
     <channel lang="cz" xmltv_id="NHKWorldJapan.jp" site_id="NHK+World+TV">NHK World Japan</channel>
-    <channel lang="cz" xmltv_id="NickelodeonCzechia.us" site_id="Nickelodeon">Nickelodeon Czechia</channel>
-    <channel lang="cz" xmltv_id="NickJrCentralEasternEurope.us" site_id="Nick+Jr.+%28en%29">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="cz" xmltv_id="NickJrCzechia.us" site_id="Nick+Jr.">Nick Jr Czechia</channel>
-    <channel lang="cz" xmltv_id="NicktoonsCzechia.us" site_id="Nicktoons">Nicktoons Czechia</channel>
+    <channel lang="cz" xmltv_id="NickelodeonCzechia.cz" site_id="Nickelodeon">Nickelodeon Czechia</channel>
+    <channel lang="cz" xmltv_id="NickJrCzechia.cz" site_id="Nick+Jr.">Nick Jr Czechia</channel>
+    <channel lang="cz" xmltv_id="NicktoonsCzechia.cz" site_id="Nicktoons">Nicktoons Czechia</channel>
     <channel lang="cz" xmltv_id="NitroGermany.de" site_id="RTL+Nitro">Nitro Deutschland</channel>
     <channel lang="cz" xmltv_id="NovaAction.cz" site_id="Nova+Action">Nova Action</channel>
     <channel lang="cz" xmltv_id="NovaCinema.cz" site_id="Nova+Cinema">Nova Cinema</channel>
diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index fac40d36..0cae3424 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -73,8 +73,8 @@
     <channel lang="de" xmltv_id="NTVAustria.de" site_id="n_tv_HD">N-TV Austria</channel>
     <channel lang="de" xmltv_id="NationalGeographicGermany.us" site_id="Nat_Geo_HD">NatGeo HD</channel>
     <channel lang="de" xmltv_id="NationalGeographicWildGermany.us" site_id="Nat_Geo_People_HD">National Geographic Wild HD</channel>
-    <channel lang="de" xmltv_id="NickJrEurope.us" site_id="Nick_Junior">Nick.Jr.</channel>
-    <channel lang="de" xmltv_id="NickelodeonGermany.us" site_id="Nickelodeon_HD">Nick HD</channel>
+    <channel lang="de" xmltv_id="NickJrGermany.de" site_id="Nick_Junior">Nick.Jr.</channel>
+    <channel lang="de" xmltv_id="NickHDGermany.de" site_id="Nickelodeon_HD">Nick HD</channel>
     <channel lang="de" xmltv_id="NitroAustria.de" site_id="RTL_Nitro_HD">Nitro Austria</channel>
     <channel lang="de" xmltv_id="ORF1.at" site_id="ORF_eins_HD">ORF 1</channel>
     <channel lang="de" xmltv_id="ORF2Burgenland.at" site_id="ORF2_Burgenland_HD">ORF 2 Burgenland</channel>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index 8170d67a..f032598c 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -105,8 +105,8 @@
     <channel lang="de" xmltv_id="NDRFernsehenMecklenburgVorpommern.de" site_id="240">NDR Fernsehen Mecklenburg-Vorpommern</channel>
     <channel lang="de" xmltv_id="NDRFernsehenNiedersachsen.de" site_id="377">NDR Fernsehen Niedersachsen</channel>
     <channel lang="de" xmltv_id="NDRFernsehenSchleswigHolstein.de" site_id="151">NDR Fernsehen Schleswig-Holstein</channel>
-    <channel lang="de" xmltv_id="NickJrEurope.us" site_id="221">Nick Jr.</channel>
-    <channel lang="de" xmltv_id="NicktoonsGermany.us" site_id="4405">Nicktoons (Sky)</channel>
+    <channel lang="de" xmltv_id="NickJrGermany.de" site_id="221">Nick Jr.</channel>
+    <channel lang="de" xmltv_id="NicktoonsGermany.de" site_id="4405">Nicktoons (Sky)</channel>
     <channel lang="de" xmltv_id="NiederbayernTVDeggendorf.de" site_id="177">NIEDERBAYERN TV - DEG</channel>
     <channel lang="de" xmltv_id="NiederbayernTVLandshut.de" site_id="174">NIEDERBAYERN TV - LA</channel>
     <channel lang="de" xmltv_id="NiederbayernTVPassau.de" site_id="154">NIEDERBAYERN TV - PA</channel>
diff --git a/sites/magticom.ge/magticom.ge_ge.channels.xml b/sites/magticom.ge/magticom.ge_ge.channels.xml
index 3cc1e80c..e2d04412 100644
--- a/sites/magticom.ge/magticom.ge_ge.channels.xml
+++ b/sites/magticom.ge/magticom.ge_ge.channels.xml
@@ -71,8 +71,8 @@
     <channel lang="ru" xmltv_id="NationalGeographicRussia.us" site_id="55">National Geographic Russia</channel>
     <channel lang="ru" xmltv_id="NationalGeographicWildRussia.us" site_id="33">National Geographic Wild Russia</channel>
     <channel lang="ru" xmltv_id="Nauka.ru" site_id="258">Nauka</channel>
-    <channel lang="ru" xmltv_id="NickelodeonCIS.us" site_id="54">Nickelodeon CIS</channel>
-    <channel lang="ru" xmltv_id="NickJrCIS.us" site_id="171">Nick Jr CIS</channel>
+    <channel lang="ru" xmltv_id="NickelodeonCIS.ru" site_id="54">Nickelodeon CIS</channel>
+    <channel lang="ru" xmltv_id="NickJrCIS.ru" site_id="171">Nick Jr CIS</channel>
     <channel lang="ru" xmltv_id="NST.ru" site_id="214">NST</channel>
     <channel lang="ka" xmltv_id="ObieqtiviTV.ge" site_id="85">Obieqtivi TV</channel>
     <channel lang="ru" xmltv_id="OhotnikiRybolov.ru" site_id="174">Ohotnik i Rybolov</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
index 1d511773..cb6aac69 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
@@ -90,11 +90,10 @@
     <channel lang="hr" xmltv_id="NationalGeographicHrvatska.us" site_id="382">National Geographic Hrvatska</channel>
     <channel lang="hr" xmltv_id="NationalGeographicWildEurope.us" site_id="370">National Geographic Wild Europe</channel>
     <channel lang="hr" xmltv_id="NauticalChannel.it" site_id="315">Nautical Channel</channel>
-    <channel lang="hr" xmltv_id="NickelodeonEurope.us" site_id="430">Nickelodeon Europe</channel>
-    <channel lang="hr" xmltv_id="NickelodeonHD.us" site_id="373">Nickelodeon HD</channel>
-    <channel lang="hr" xmltv_id="NickJrCentralEasternEurope.us" site_id="429">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="hr" xmltv_id="NickMusic.us" site_id="269">NickMusic</channel>
-    <channel lang="hr" xmltv_id="NicktoonsRomania.us" site_id="364">Nicktoons România</channel>
+    <channel lang="hr" xmltv_id="NickelodeonCroatia.hr" site_id="430">Nickelodeon</channel>
+    <channel lang="hr" xmltv_id="NickJrCroatia.hr" site_id="429">Nick Jr</channel>
+    <channel lang="hr" xmltv_id="NickMusicUS.us" site_id="269">NickMusic</channel>
+    <channel lang="hr" xmltv_id="NicktoonsRomania.ro" site_id="364">Nicktoons România</channel>
     <channel lang="hr" xmltv_id="TVNova.hr" site_id="112">TV Nova</channel>
     <channel lang="hr" xmltv_id="NovaTV.hr" site_id="91">Nova TV</channel>
     <channel lang="hr" xmltv_id="NTVMir.ru" site_id="258">NTV Mir</channel>
diff --git a/sites/meo.pt/meo.pt_pt.channels.xml b/sites/meo.pt/meo.pt_pt.channels.xml
index 7c847924..8dfefb69 100644
--- a/sites/meo.pt/meo.pt_pt.channels.xml
+++ b/sites/meo.pt/meo.pt_pt.channels.xml
@@ -115,7 +115,7 @@
     <channel lang="pt" xmltv_id="NHKWorldJapan.jp" site_id="NHKHD">NHK World Japan</channel>
     <channel lang="pt" xmltv_id="NationalGeographicPortugal.us" site_id="NGC">National Geographic Portugal</channel>
     <channel lang="pt" xmltv_id="NationalGeographicWildEurope.us" site_id="WILD">National Geographic Wild Europe</channel>
-    <channel lang="pt" xmltv_id="NickelodeonEurope.us" site_id="NICKELO">Nickelodeon Europe</channel>
+    <channel lang="pt" xmltv_id="NickelodeonSpain.es" site_id="NICKELO">Nickelodeon</channel>
     <channel lang="pt" xmltv_id="Odisseia.es" site_id="ODISS">Odisseia</channel>
     <channel lang="pt" xmltv_id="PFCInternacional.br" site_id="PFC">PFC Internacional</channel>
     <channel lang="pt" xmltv_id="PandaKids.pt" site_id="PANDAK">Panda Kids</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index 9e9be686..eeaacd24 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -110,7 +110,7 @@
     <channel lang="es" xmltv_id="NationalGeographicWildLatin.us" site_id="ar#nat-geo-wild">National Geographic Wild Latin</channel>
     <channel lang="es" xmltv_id="NBATVLatinAmerica.us" site_id="ar#nba-tv">NBA TV Latin America</channel>
     <channel lang="es" xmltv_id="NetTV.ar" site_id="ar#net-tv">Net TV</channel>
-    <channel lang="es" xmltv_id="NickelodeonSur.us" site_id="ar#nickelodeon">Nickelodeon Sur</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="ar#nickelodeon">Nickelodeon Sur</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="ar#nick-jr">Nick Jr Latin America</channel>
     <channel lang="es" xmltv_id="NicktoonsLatinAmerica.us" site_id="ar#nicktoons">Nicktoons Latin America</channel>
     <channel lang="es" xmltv_id="Pakapaka.ar" site_id="ar#pakapaka">Pakapaka</channel>
diff --git a/sites/mi.tv/mi.tv_br.channels.xml b/sites/mi.tv/mi.tv_br.channels.xml
index 8720c96b..a72c9b30 100644
--- a/sites/mi.tv/mi.tv_br.channels.xml
+++ b/sites/mi.tv/mi.tv_br.channels.xml
@@ -99,8 +99,8 @@
     <channel lang="pt" xmltv_id="NationalGeographicBrasil.us" site_id="br#national-geographic">National Geographic Brasil</channel>
     <channel lang="pt" xmltv_id="NationalGeographicWildBrasil.us" site_id="br#natgeo-wild-hd">National Geographic Wild Brasil</channel>
     <channel lang="pt" xmltv_id="NHKWorldJapan.jp" site_id="br#nhk">NHK World Japan</channel>
-    <channel lang="pt" xmltv_id="NickelodeonBrasil.us" site_id="br#nickelodeon">Nickelodeon Brasil</channel>
-    <channel lang="pt" xmltv_id="NickJrBrasil.us" site_id="br#nick-jr">Nick Jr Brasil</channel>
+    <channel lang="pt" xmltv_id="NickelodeonBrazil.br" site_id="br#nickelodeon">Nickelodeon Brasil</channel>
+    <channel lang="pt" xmltv_id="NickJrBrazil.br" site_id="br#nick-jr">Nick Jr Brasil</channel>
     <channel lang="pt" xmltv_id="NSCTVBlumenau.br" site_id="br#nsc-tv-blumenau-hd">NSC TV Blumenau</channel>
     <channel lang="pt" xmltv_id="NSCTVChapeco.br" site_id="br#nsc-tv-chapeco-hd">NSC TV Chapecó</channel>
     <channel lang="pt" xmltv_id="NSCTVCriciuma.br" site_id="br#nsc-tv-criciuma">NSC TV Criciúma</channel>
diff --git a/sites/mi.tv/mi.tv_pe.channels.xml b/sites/mi.tv/mi.tv_pe.channels.xml
index 8cadca5d..17c54e73 100644
--- a/sites/mi.tv/mi.tv_pe.channels.xml
+++ b/sites/mi.tv/mi.tv_pe.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="es" xmltv_id="Latina.pe" site_id="pe#frecuencia-latina">Latina</channel>
     <channel lang="es" xmltv_id="MasChicEstadosUnidos.us" site_id="pe#mas-chic">Más Chic Estados Unidos</channel>
     <channel lang="es" xmltv_id="MiGenteTV.co" site_id="pe#mi-gente">Mi Gente TV</channel>
-    <channel lang="es" xmltv_id="NickelodeonHD.us" site_id="pe#nickelodeon">Nickelodeon HD</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="pe#nickelodeon">Nickelodeon</channel>
     <channel lang="es" xmltv_id="PanamericanaTV.pe" site_id="pe#panamericana-tv">Panamericana TV</channel>
     <channel lang="es" xmltv_id="PAT.bo" site_id="pe#pat">PAT</channel>
     <channel lang="es" xmltv_id="RumbaTV.co" site_id="pe#rumba-tv">Rumba TV</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index 0dffefa9..c40e8a41 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -76,8 +76,8 @@
     <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>
-    <channel lang="en" xmltv_id="NickelodeonSouthEastAsia.us" site_id="49">Nickelodeon South East Asia</channel>
-    <channel lang="en" xmltv_id="NickJrAsia.us" site_id="37">Nick Jr Asia</channel>
+    <channel lang="en" xmltv_id="NickelodeonAsia.sg" site_id="49">Nickelodeon South East Asia</channel>
+    <channel lang="en" xmltv_id="NickJrAsia.sg" site_id="37">Nick Jr Asia</channel>
     <channel lang="en" xmltv_id="OKTV.id" site_id="95">OK TV</channel>
     <channel lang="en" xmltv_id="One.in" site_id="164">One</channel>
     <channel lang="en" xmltv_id="QuranTV.sa" site_id="93">Quran TV</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index 266beeb4..ddb766fc 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -76,8 +76,8 @@
     <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>
-    <channel lang="id" xmltv_id="NickelodeonSouthEastAsia.us" site_id="49">Nickelodeon South East Asia</channel>
-    <channel lang="id" xmltv_id="NickJrAsia.us" site_id="37">Nick Jr Asia</channel>
+    <channel lang="id" xmltv_id="NickelodeonAsia.sg" site_id="49">Nickelodeon South East Asia</channel>
+    <channel lang="id" xmltv_id="NickJrAsia.sg" site_id="37">Nick Jr Asia</channel>
     <channel lang="id" xmltv_id="OKTV.id" site_id="95">OK TV</channel>
     <channel lang="id" xmltv_id="One.in" site_id="164">One</channel>
     <channel lang="id" xmltv_id="QuranTV.sa" site_id="93">Quran TV</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es_channels.xml b/sites/movistarplus.es/movistarplus.es_es_channels.xml
index e3812596..c9928a8b 100644
--- a/sites/movistarplus.es/movistarplus.es_es_channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es_channels.xml
@@ -148,8 +148,8 @@
     <channel lang="es" xmltv_id="NegociosTV.es" site_id="NEGOTV">Negocios TV</channel>
     <channel lang="es" xmltv_id="Neox.es" site_id="NEOX">Neox</channel>
     <channel lang="es" xmltv_id="NHKWorldJapan.jp" site_id="NHK">NHK World Japan</channel>
-    <channel lang="es" xmltv_id="NickelodeonIberia.us" site_id="NICK">Nickelodeon Iberia</channel>
-    <channel lang="es" xmltv_id="NickJrSpain.us" site_id="NICKJR">Nick Jr España</channel>
+    <channel lang="es" xmltv_id="NickelodeonSpain.es" site_id="NICK">Nickelodeon Iberia</channel>
+    <channel lang="es" xmltv_id="NickJrSpain.es" site_id="NICKJR">Nick Jr España</channel>
     <channel lang="es" xmltv_id="Nova.es" site_id="NOVA">Nova</channel>
     <channel lang="es" xmltv_id="Odisea.es" site_id="ODISEA">Odisea</channel>
     <channel lang="es" xmltv_id="ParamountChannelSpain.us" site_id="PARCH">Paramount Channel España</channel>
diff --git a/sites/mtel.ba/mtel.ba_ba.channels.xml b/sites/mtel.ba/mtel.ba_ba.channels.xml
index 58957c59..bfba70b7 100644
--- a/sites/mtel.ba/mtel.ba_ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba_ba.channels.xml
@@ -106,7 +106,7 @@
     <channel lang="bs" xmltv_id="Muzzik.rs" site_id="607#267">Muzzik</channel>
     <channel lang="bs" xmltv_id="NationalGeographicSrbija.us" site_id="401#119">National Geographic Srbija</channel>
     <channel lang="bs" xmltv_id="NationalGeographicWildEurope.us" site_id="134#121">National Geographic Wild Europe</channel>
-    <channel lang="bs" xmltv_id="NicktoonsAdria.us" site_id="218#424">Nicktoons Adria</channel>
+    <channel lang="bs" xmltv_id="NicktoonsAdria.hr" site_id="218#424">Nicktoons Adria</channel>
     <channel lang="bs" xmltv_id="OTVValentino.ba" site_id="093#448">OTV Valentino</channel>
     <channel lang="bs" xmltv_id="PinkAction.rs" site_id="309#131">Pink Action</channel>
     <channel lang="bs" xmltv_id="PinkBH.rs" site_id="004#288">Pink BH</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index ad086a21..d136506d 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -155,9 +155,9 @@
     <channel lang="sr" xmltv_id="NatGeoWildEurope.us" site_id="354#121">Nat Geo Wild Europe</channel>
     <channel lang="sr" xmltv_id="NationalGeographicSrbija.us" 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="NickelodeonEurope.us" site_id="400#94">Nickelodeon Europe</channel>
-    <channel lang="sr" xmltv_id="NickJrCentralEasternEurope.us" site_id="402#95">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="sr" xmltv_id="NicktoonsAdria.us" site_id="409#753">Nicktoons Adria</channel>
+    <channel lang="sr" xmltv_id="NickelodeonSerbia.rs" site_id="400#94">Nickelodeon</channel>
+    <channel lang="sr" xmltv_id="NickJrSerbia.rs" site_id="402#95">Nick Jr</channel>
+    <channel lang="sr" xmltv_id="NicktoonsAdria.hr" site_id="409#753">Nicktoons Adria</channel>
     <channel lang="sr" xmltv_id="NovosadskaTV.rs" site_id="532#305">Novosadska TV</channel>
     <channel lang="sr" xmltv_id="NTV.rs" site_id="611#449">NTV</channel>
     <channel lang="sr" xmltv_id="OBN.ba" site_id="659#628">OBN</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index a4d5dbc5..36060adc 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -117,9 +117,9 @@
     <channel lang="hu" xmltv_id="NationalGeographicHungaryCzechia.us" site_id="NATGEO">National Geographic (HD)</channel>
     <channel lang="hu" xmltv_id="NationalGeographicWildHungary.us" site_id="NATGEOWILD">National Geographic Wild (HD)</channel>
     <channel lang="hu" xmltv_id="NauticalChannel.it" site_id="NAUTICAL_CHANNEL">Nautical Channel (HD)</channel>
-    <channel lang="hu" xmltv_id="NickelodeonEurope.us" site_id="NICKELODEON">Nickelodeon</channel>
-    <channel lang="hu" xmltv_id="NickJrHungary.us" site_id="NICKJR">Nick Jr</channel>
-    <channel lang="hu" xmltv_id="NicktoonsRomania.us" site_id="NICKTOONS">Nicktoons</channel>
+    <channel lang="hu" xmltv_id="NickelodeonHungary.hu" site_id="NICKELODEON">Nickelodeon</channel>
+    <channel lang="hu" xmltv_id="NickJrHungary.hu" site_id="NICKJR">Nick Jr</channel>
+    <channel lang="hu" xmltv_id="NicktoonsRomania.ro" site_id="NICKTOONS">Nicktoons</channel>
     <channel lang="hu" xmltv_id="OzoneTV.hu" site_id="OZONE_TV">Ozone TV (HD)</channel>
     <channel lang="hu" xmltv_id="PannonTV.rs" site_id="PANNON_TV">Pannon TV (Vajdaság)</channel>
     <channel lang="hu" xmltv_id="ParamountNetworkHungary.us" site_id="PARAMOUNT">Paramount Network (HD)</channel>
@@ -147,7 +147,7 @@
     <channel lang="hu" xmltv_id="Story4.hu" site_id="STORY4">Story 4 (HD)</channel>
     <channel lang="hu" xmltv_id="SuperTV2.hu" site_id="SUPERTV2">Super TV2 (HD)</channel>
     <channel lang="hu" xmltv_id="SzegedTV.hu" site_id="SZEGED_TV">Szeged TV</channel>
-    <channel lang="hu" xmltv_id="TeenNickHungary.us" site_id="TEENNICK">TeenNick</channel>
+    <channel lang="hu" xmltv_id="TeenNickHungary.hu" site_id="TEENNICK">TeenNick</channel>
     <channel lang="hu" xmltv_id="TLCHungary.us" site_id="TLC">TLC (HD)</channel>
     <channel lang="hu" xmltv_id="TotalDanceTV.hu" site_id="TOTALDANCE_TV">Total Dance TV (HD)</channel>
     <channel lang="hu" xmltv_id="TraceSportStars.fr" site_id="TRACESPORTS">Trace Sports HD</channel>
diff --git a/sites/novacyprus.com/novacyprus.com_cy.channels.xml b/sites/novacyprus.com/novacyprus.com_cy.channels.xml
index b24aa515..a62609a0 100644
--- a/sites/novacyprus.com/novacyprus.com_cy.channels.xml
+++ b/sites/novacyprus.com/novacyprus.com_cy.channels.xml
@@ -16,7 +16,7 @@
     <channel lang="el" xmltv_id="MTVLive.us" site_id="673">MTV Live</channel>
     <channel lang="el" xmltv_id="MyZenTV.fr" site_id="221">MyZen TV</channel>
     <channel lang="el" xmltv_id="NationalGeographicEllada.us" site_id="617">National Geographic Ellada</channel>
-    <channel lang="el" xmltv_id="NickelodeonGreece.us" site_id="544">Nickelodeon Greece</channel>
+    <channel lang="el" xmltv_id="NickelodeonGreece.gr" site_id="544">Nickelodeon Greece</channel>
     <channel lang="el" xmltv_id="NovaCinema1.gr" site_id="614">Nova Cinema 1</channel>
     <channel lang="el" xmltv_id="NovaCinema2.gr" site_id="653">Nova Cinema 2</channel>
     <channel lang="el" xmltv_id="NovaCinema3.gr" site_id="652">Nova Cinema 3</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 ae455193..7282d5f3 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
@@ -66,8 +66,8 @@
     <channel lang="en" xmltv_id="NationalGeographicWildAsia.us" 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="NickelodeonSouthEastAsia.us" site_id="444">Nickelodeon South East Asia</channel>
-    <channel lang="en" xmltv_id="NickJrAsia.us" site_id="449">Nick Jr Asia</channel>
+    <channel lang="en" xmltv_id="NickelodeonAsia.sg" site_id="444">Nickelodeon South East Asia</channel>
+    <channel lang="en" xmltv_id="NickJrAsia.sg" site_id="449">Nick Jr Asia</channel>
     <channel lang="en" xmltv_id="Now668.hk" site_id="668">Now 668</channel>
     <channel lang="en" xmltv_id="NowBaoguMovies.hk" site_id="133">Now Baogu Movies</channel>
     <channel lang="en" xmltv_id="NowBaoguSuperstars.hk" site_id="138">Now Baogu Superstars</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 045ae909..a8f4f240 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
@@ -66,8 +66,8 @@
     <channel lang="zh" xmltv_id="NationalGeographicWildAsia.us" 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="NickelodeonSouthEastAsia.us" site_id="444">Nickelodeon South East Asia</channel>
-    <channel lang="zh" xmltv_id="NickJrAsia.us" site_id="449">Nick Jr Asia</channel>
+    <channel lang="zh" xmltv_id="NickelodeonAsia.sg" site_id="444">Nickelodeon South East Asia</channel>
+    <channel lang="zh" xmltv_id="NickJrAsia.sg" site_id="449">Nick Jr Asia</channel>
     <channel lang="zh" xmltv_id="Now668.hk" site_id="668">Now 668</channel>
     <channel lang="zh" xmltv_id="NowBaoguMovies.hk" site_id="133">Now Baogu Movies</channel>
     <channel lang="zh" xmltv_id="NowBaoguSuperstars.hk" site_id="138">Now Baogu Superstars</channel>
diff --git a/sites/osn.com/osn.com_ae-ar.channels.xml b/sites/osn.com/osn.com_ae-ar.channels.xml
index 89214f44..0c449e9c 100644
--- a/sites/osn.com/osn.com_ae-ar.channels.xml
+++ b/sites/osn.com/osn.com_ae-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="AE#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="AE#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="AE#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="AE#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="AE#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="AE#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="AE#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="AE#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="AE#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="AE#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="AE#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="AE#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ae-en.channels.xml b/sites/osn.com/osn.com_ae-en.channels.xml
index 80a15c55..76305080 100644
--- a/sites/osn.com/osn.com_ae-en.channels.xml
+++ b/sites/osn.com/osn.com_ae-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="AE#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="AE#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="AE#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="AE#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="AE#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="AE#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="AE#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="AE#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="AE#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="AE#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="AE#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="AE#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_bh-ar.channels.xml b/sites/osn.com/osn.com_bh-ar.channels.xml
index ca14d8f6..effc9aaf 100644
--- a/sites/osn.com/osn.com_bh-ar.channels.xml
+++ b/sites/osn.com/osn.com_bh-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="BH#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="BH#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="BH#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="BH#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="BH#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="BH#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="BH#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="BH#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="BH#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="BH#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="BH#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="BH#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_bh-en.channels.xml b/sites/osn.com/osn.com_bh-en.channels.xml
index 5f7d2375..567d1898 100644
--- a/sites/osn.com/osn.com_bh-en.channels.xml
+++ b/sites/osn.com/osn.com_bh-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="BH#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="BH#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="BH#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="BH#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="BH#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="BH#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="BH#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="BH#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="BH#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="BH#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="BH#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="BH#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_dz-ar.channels.xml b/sites/osn.com/osn.com_dz-ar.channels.xml
index 38c391ea..c84067c9 100644
--- a/sites/osn.com/osn.com_dz-ar.channels.xml
+++ b/sites/osn.com/osn.com_dz-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="AG#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="AG#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="AG#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="AG#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="AG#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="AG#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="AG#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="AG#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="AG#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="AG#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="AG#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="AG#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_dz-en.channels.xml b/sites/osn.com/osn.com_dz-en.channels.xml
index 9131de67..af63bd41 100644
--- a/sites/osn.com/osn.com_dz-en.channels.xml
+++ b/sites/osn.com/osn.com_dz-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="AG#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="AG#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="AG#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="AG#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="AG#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="AG#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="AG#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="AG#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="AG#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="AG#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="AG#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="AG#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_eg-ar.channels.xml b/sites/osn.com/osn.com_eg-ar.channels.xml
index 2cffc332..98b2b9fa 100644
--- a/sites/osn.com/osn.com_eg-ar.channels.xml
+++ b/sites/osn.com/osn.com_eg-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="EG#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="EG#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="EG#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="EG#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="EG#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="EG#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="EG#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="EG#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="EG#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="EG#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="EG#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="EG#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_eg-en.channels.xml b/sites/osn.com/osn.com_eg-en.channels.xml
index 9f82b116..3bcd7d94 100644
--- a/sites/osn.com/osn.com_eg-en.channels.xml
+++ b/sites/osn.com/osn.com_eg-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="EG#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="EG#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="EG#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="EG#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="EG#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="EG#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="EG#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="EG#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="EG#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="EG#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="EG#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="EG#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_iq-ar.channels.xml b/sites/osn.com/osn.com_iq-ar.channels.xml
index 1e141ecf..902eddf9 100644
--- a/sites/osn.com/osn.com_iq-ar.channels.xml
+++ b/sites/osn.com/osn.com_iq-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="IQ#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="IQ#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="IQ#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="IQ#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="IQ#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="IQ#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="IQ#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="IQ#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="IQ#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="IQ#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="IQ#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="IQ#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_iq-en.channels.xml b/sites/osn.com/osn.com_iq-en.channels.xml
index ff569816..b4e9c24c 100644
--- a/sites/osn.com/osn.com_iq-en.channels.xml
+++ b/sites/osn.com/osn.com_iq-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="IQ#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="IQ#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="IQ#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="IQ#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="IQ#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="IQ#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="IQ#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="IQ#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="IQ#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="IQ#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="IQ#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="IQ#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_jo-ar.channels.xml b/sites/osn.com/osn.com_jo-ar.channels.xml
index 238bb264..e4053d3e 100644
--- a/sites/osn.com/osn.com_jo-ar.channels.xml
+++ b/sites/osn.com/osn.com_jo-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="JO#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="JO#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="JO#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="JO#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="JO#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="JO#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="JO#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="JO#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="JO#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="JO#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="JO#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="JO#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_jo-en.channels.xml b/sites/osn.com/osn.com_jo-en.channels.xml
index 5f6c8530..4d69b212 100644
--- a/sites/osn.com/osn.com_jo-en.channels.xml
+++ b/sites/osn.com/osn.com_jo-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="JO#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="JO#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="JO#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="JO#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="JO#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="JO#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="JO#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="JO#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="JO#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="JO#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="JO#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="JO#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_kw-ar.channels.xml b/sites/osn.com/osn.com_kw-ar.channels.xml
index cf4716b0..97c8cdb2 100644
--- a/sites/osn.com/osn.com_kw-ar.channels.xml
+++ b/sites/osn.com/osn.com_kw-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="KW#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="KW#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="KW#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="KW#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="KW#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="KW#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="KW#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="KW#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="KW#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="KW#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="KW#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="KW#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_kw-en.channels.xml b/sites/osn.com/osn.com_kw-en.channels.xml
index d15c6a5a..fc67b48d 100644
--- a/sites/osn.com/osn.com_kw-en.channels.xml
+++ b/sites/osn.com/osn.com_kw-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="KW#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="KW#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="KW#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="KW#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="KW#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="KW#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="KW#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="KW#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="KW#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="KW#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="KW#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="KW#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_lb-ar.channels.xml b/sites/osn.com/osn.com_lb-ar.channels.xml
index 8688dbc5..c8be50af 100644
--- a/sites/osn.com/osn.com_lb-ar.channels.xml
+++ b/sites/osn.com/osn.com_lb-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="LB#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="LB#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="LB#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="LB#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="LB#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="LB#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="LB#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="LB#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="LB#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="LB#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="LB#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="LB#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_lb-en.channels.xml b/sites/osn.com/osn.com_lb-en.channels.xml
index 59eff99c..63744e48 100644
--- a/sites/osn.com/osn.com_lb-en.channels.xml
+++ b/sites/osn.com/osn.com_lb-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="LB#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="LB#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="LB#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="LB#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="LB#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="LB#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="LB#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="LB#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="LB#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="LB#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="LB#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="LB#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ly-ar.channels.xml b/sites/osn.com/osn.com_ly-ar.channels.xml
index 005e4f9c..dcb13e52 100644
--- a/sites/osn.com/osn.com_ly-ar.channels.xml
+++ b/sites/osn.com/osn.com_ly-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="LY#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="LY#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="LY#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="LY#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="LY#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="LY#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="LY#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="LY#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="LY#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="LY#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="LY#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="LY#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ly-en.channels.xml b/sites/osn.com/osn.com_ly-en.channels.xml
index 645de7b6..ef7ef19c 100644
--- a/sites/osn.com/osn.com_ly-en.channels.xml
+++ b/sites/osn.com/osn.com_ly-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="LY#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="LY#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="LY#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="LY#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="LY#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="LY#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="LY#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="LY#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="LY#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="LY#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="LY#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="LY#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ma-ar.channels.xml b/sites/osn.com/osn.com_ma-ar.channels.xml
index f7a8a4b6..007e88d9 100644
--- a/sites/osn.com/osn.com_ma-ar.channels.xml
+++ b/sites/osn.com/osn.com_ma-ar.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="MA#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="MA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="MA#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="MA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="MA#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="MA#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="MA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="MA#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="MA#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="MA#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="MA#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="MA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ma-en.channels.xml b/sites/osn.com/osn.com_ma-en.channels.xml
index 6d0514f6..91e467a3 100644
--- a/sites/osn.com/osn.com_ma-en.channels.xml
+++ b/sites/osn.com/osn.com_ma-en.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="MA#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="MA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="MA#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="MA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="MA#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="MA#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="MA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="MA#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="MA#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="MA#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="MA#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="MA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_mr-ar.channels.xml b/sites/osn.com/osn.com_mr-ar.channels.xml
index 61c5dcef..a427a464 100644
--- a/sites/osn.com/osn.com_mr-ar.channels.xml
+++ b/sites/osn.com/osn.com_mr-ar.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="MR#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="MR#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="MR#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="MR#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="MR#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="MR#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="MR#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="MR#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="MR#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="MR#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="MR#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="MR#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_mr-en.channels.xml b/sites/osn.com/osn.com_mr-en.channels.xml
index 6f01b082..b778de99 100644
--- a/sites/osn.com/osn.com_mr-en.channels.xml
+++ b/sites/osn.com/osn.com_mr-en.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="MR#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="MR#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="MR#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="MR#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="MR#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="MR#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="MR#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="MR#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="MR#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="MR#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="MR#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="MR#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_om-ar.channels.xml b/sites/osn.com/osn.com_om-ar.channels.xml
index fce9f595..e528963e 100644
--- a/sites/osn.com/osn.com_om-ar.channels.xml
+++ b/sites/osn.com/osn.com_om-ar.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="OM#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="OM#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="OM#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="OM#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="OM#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="OM#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="OM#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="OM#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="OM#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="OM#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="OM#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="OM#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_om-en.channels.xml b/sites/osn.com/osn.com_om-en.channels.xml
index fa779ac7..fb056210 100644
--- a/sites/osn.com/osn.com_om-en.channels.xml
+++ b/sites/osn.com/osn.com_om-en.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="OM#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="OM#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="OM#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="OM#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="OM#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="OM#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="OM#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="OM#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="OM#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="OM#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="OM#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="OM#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ps-ar.channels.xml b/sites/osn.com/osn.com_ps-ar.channels.xml
index b1107074..8ae9126b 100644
--- a/sites/osn.com/osn.com_ps-ar.channels.xml
+++ b/sites/osn.com/osn.com_ps-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="PS#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="PS#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="PS#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="PS#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="PS#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="PS#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="PS#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="PS#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="PS#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="PS#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="PS#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="PS#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ps-en.channels.xml b/sites/osn.com/osn.com_ps-en.channels.xml
index 3ea41827..8f50a62c 100644
--- a/sites/osn.com/osn.com_ps-en.channels.xml
+++ b/sites/osn.com/osn.com_ps-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="PS#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="PS#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="PS#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="PS#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="PS#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="PS#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="PS#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="PS#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="PS#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="PS#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="PS#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="PS#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_qa-ar.channels.xml b/sites/osn.com/osn.com_qa-ar.channels.xml
index 7f7765f8..3ffd3e2c 100644
--- a/sites/osn.com/osn.com_qa-ar.channels.xml
+++ b/sites/osn.com/osn.com_qa-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="QA#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="QA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="QA#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="QA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="QA#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="QA#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="QA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="QA#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="QA#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="QA#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="QA#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="QA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_qa-en.channels.xml b/sites/osn.com/osn.com_qa-en.channels.xml
index bb269776..d1e01acd 100644
--- a/sites/osn.com/osn.com_qa-en.channels.xml
+++ b/sites/osn.com/osn.com_qa-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="QA#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="QA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="QA#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="QA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="QA#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="QA#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="QA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="QA#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="QA#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="QA#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="QA#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="QA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_sa-ar.channels.xml b/sites/osn.com/osn.com_sa-ar.channels.xml
index 4445bfd1..6d85b4af 100644
--- a/sites/osn.com/osn.com_sa-ar.channels.xml
+++ b/sites/osn.com/osn.com_sa-ar.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="SA#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="SA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="SA#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="SA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="SA#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="SA#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="SA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="SA#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="SA#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="SA#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="SA#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="SA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_sa-en.channels.xml b/sites/osn.com/osn.com_sa-en.channels.xml
index 439fca88..847add1e 100644
--- a/sites/osn.com/osn.com_sa-en.channels.xml
+++ b/sites/osn.com/osn.com_sa-en.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="SA#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="SA#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="SA#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="SA#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="SA#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="SA#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="SA#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="SA#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="SA#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="SA#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="SA#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="SA#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_td-ar.channels.xml b/sites/osn.com/osn.com_td-ar.channels.xml
index 1e9ec7c7..0349674a 100644
--- a/sites/osn.com/osn.com_td-ar.channels.xml
+++ b/sites/osn.com/osn.com_td-ar.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="CH#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="CH#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="CH#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="CH#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="CH#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="CH#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="CH#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="CH#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="CH#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="CH#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="CH#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="CH#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_td-en.channels.xml b/sites/osn.com/osn.com_td-en.channels.xml
index 4767eb81..44d3194f 100644
--- a/sites/osn.com/osn.com_td-en.channels.xml
+++ b/sites/osn.com/osn.com_td-en.channels.xml
@@ -66,9 +66,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="CH#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="CH#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="CH#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="CH#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="CH#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="CH#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="CH#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="CH#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="CH#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="CH#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="CH#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="CH#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ye-ar.channels.xml b/sites/osn.com/osn.com_ye-ar.channels.xml
index ad09d77d..2ef6fc53 100644
--- a/sites/osn.com/osn.com_ye-ar.channels.xml
+++ b/sites/osn.com/osn.com_ye-ar.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.us" site_id="YE#NGO">National Geographic Middle East</channel>
     <channel lang="ar" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="YE#NHD">National Geographic Wild Middle East</channel>
     <channel lang="ar" xmltv_id="NHKWorldJapan.jp" site_id="YE#NHK">NHK World Japan</channel>
-    <channel lang="ar" xmltv_id="NickelodeonArabia.us" site_id="YE#NIC">Nickelodeon Arabia</channel>
-    <channel lang="ar" xmltv_id="NickJrArabia.us" site_id="YE#NJR">Nick Jr Arabia</channel>
-    <channel lang="ar" xmltv_id="NickToonsArabia.us" site_id="YE#NKT">NickToons Arabia</channel>
+    <channel lang="ar" xmltv_id="NickelodeonArabia.ae" site_id="YE#NIC">Nickelodeon Arabia</channel>
+    <channel lang="ar" xmltv_id="NickJrArabia.ae" site_id="YE#NJR">Nick Jr Arabia</channel>
+    <channel lang="ar" xmltv_id="NicktoonsArabia.ae" site_id="YE#NKT">NickToons Arabia</channel>
     <channel lang="ar" xmltv_id="OSNAction.ae" site_id="YE#AHD">OSN Action</channel>
     <channel lang="ar" xmltv_id="OSNComedy.ae" site_id="YE#OCO">OSN Comedy</channel>
     <channel lang="ar" xmltv_id="OSNEnigma.ae" site_id="YE#OCM">OSN Enigma</channel>
diff --git a/sites/osn.com/osn.com_ye-en.channels.xml b/sites/osn.com/osn.com_ye-en.channels.xml
index 02390bf7..dd6b2345 100644
--- a/sites/osn.com/osn.com_ye-en.channels.xml
+++ b/sites/osn.com/osn.com_ye-en.channels.xml
@@ -67,9 +67,9 @@
     <channel lang="en" xmltv_id="NationalGeographicMiddleEast.us" site_id="YE#NGO">National Geographic Middle East</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildMiddleEast.us" site_id="YE#NHD">National Geographic Wild Middle East</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="YE#NHK">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonArabia.us" site_id="YE#NIC">Nickelodeon Arabia</channel>
-    <channel lang="en" xmltv_id="NickJrArabia.us" site_id="YE#NJR">Nick Jr Arabia</channel>
-    <channel lang="en" xmltv_id="NickToonsArabia.us" site_id="YE#NKT">NickToons Arabia</channel>
+    <channel lang="en" xmltv_id="NickelodeonArabia.ae" site_id="YE#NIC">Nickelodeon Arabia</channel>
+    <channel lang="en" xmltv_id="NickJrArabia.ae" site_id="YE#NJR">Nick Jr Arabia</channel>
+    <channel lang="en" xmltv_id="NicktoonsArabia.ae" site_id="YE#NKT">NickToons Arabia</channel>
     <channel lang="en" xmltv_id="OSNAction.ae" site_id="YE#AHD">OSN Action</channel>
     <channel lang="en" xmltv_id="OSNComedy.ae" site_id="YE#OCO">OSN Comedy</channel>
     <channel lang="en" xmltv_id="OSNEnigma.ae" site_id="YE#OCM">OSN Enigma</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 39654244..6a7fbb43 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
@@ -80,8 +80,8 @@
     <channel lang="es" xmltv_id="NationalGeographicSpain.us" site_id="151">National Geographic España</channel>
     <channel lang="es" xmltv_id="NationalGeographicWildSpain.us" site_id="681">National Geographic Wild España</channel>
     <channel lang="es" xmltv_id="Neox.es" site_id="508">Neox</channel>
-    <channel lang="es" xmltv_id="NickelodeonIberia.us" site_id="200">Nickelodeon Iberia</channel>
-    <channel lang="es" xmltv_id="NickJrSpain.us" site_id="687">Nick Jr España</channel>
+    <channel lang="es" xmltv_id="NickelodeonSpain.es" site_id="200">Nickelodeon Iberia</channel>
+    <channel lang="es" xmltv_id="NickJrSpain.es" site_id="687">Nick Jr España</channel>
     <channel lang="es" xmltv_id="Nova.es" site_id="509">Nova</channel>
     <channel lang="es" xmltv_id="Odisea.es" site_id="135">Odisea</channel>
     <channel lang="es" xmltv_id="ParamountChannelSpain.us" site_id="716">Paramount Channel España</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index cccb1021..b204ca12 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -141,9 +141,9 @@
     <channel lang="ro" xmltv_id="NationalGeographicWildRomania.us" site_id="national-geographic-wild">National Geographic Wild Romania</channel>
     <channel lang="ro" xmltv_id="NationalTV.ro" site_id="national-tv">National TV</channel>
     <channel lang="ro" xmltv_id="NauticalChannel.it" site_id="nautical-channel">Nautical Channel</channel>
-    <channel lang="ro" xmltv_id="NickelodeonRomania.us" site_id="nickelodeon">Nickelodeon România</channel>
-    <channel lang="ro" xmltv_id="NickJrRomania.us" site_id="nick-jr">Nick Jr România</channel>
-    <channel lang="ro" xmltv_id="NicktoonsRomania.us" site_id="nicktoons">Nicktoons România</channel>
+    <channel lang="ro" xmltv_id="NickelodeonRomania.ro" site_id="nickelodeon">Nickelodeon România</channel>
+    <channel lang="ro" xmltv_id="NickJrRomania.ro" site_id="nick-jr">Nick Jr România</channel>
+    <channel lang="ro" xmltv_id="NicktoonsRomania.ro" site_id="nicktoons">Nicktoons România</channel>
     <channel lang="ro" xmltv_id="NitroGermany.de" site_id="rtl-nitro">Nitro Deutschland</channel>
     <channel lang="ro" xmltv_id="NTV.de" site_id="n-tv">N-TV</channel>
     <channel lang="ro" xmltv_id="Phoenix.de" site_id="phoenix">Phoenix</channel>
@@ -184,7 +184,7 @@
     <channel lang="ro" xmltv_id="Story4.hu" site_id="story4">Story 4</channel>
     <channel lang="ro" xmltv_id="SuperRTLGermany.de" site_id="super-rtl">Super RTL Deutschland</channel>
     <channel lang="ro" xmltv_id="TarafTV.ro" site_id="taraf-tv">Taraf TV</channel>
-    <channel lang="ro" xmltv_id="TeenNickRomania.us" site_id="teennick">TeenNick România</channel>
+    <channel lang="ro" xmltv_id="TeenNickRomania.ro" site_id="teennick">TeenNick România</channel>
     <channel lang="ro" xmltv_id="TelekomSport1.ro" site_id="telekom-sport-1">Telekom Sport 1</channel>
     <channel lang="ro" xmltv_id="TelekomSport2.ro" site_id="telekom-sport-2">Telekom Sport 2</channel>
     <channel lang="ro" xmltv_id="TelekomSport3.ro" site_id="telekom-sport-3">Telekom Sport 3</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 52cc5a29..dd517ac8 100644
--- a/sites/programme-tv.net/programme-tv.net_fr.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
@@ -139,9 +139,9 @@
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="national-geographic-98">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="nat-geo-wild-207">National Geographic Wild France</channel>
     <channel lang="fr" xmltv_id="NauticalChannel.it" site_id="nautical-channel-109">Nautical Channel</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="nickelodeon-99">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="nickelodeon-junior-199">Nickelodeon Junior France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonTeen.us" site_id="nickelodeon-teen-384">Nickelodeon Teen</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="nickelodeon-99">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="nickelodeon-junior-199">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonTeen.fr" site_id="nickelodeon-teen-384">Nickelodeon Teen</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="nollywood-tv-348">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NonStopPeopleFrance.fr" site_id="non-stop-people-hd-241">Non Stop People France</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="novelas-tv-400">Novelas TV</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
index 9bf80f20..f1cd3360 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -180,11 +180,11 @@
     <channel lang="pl" xmltv_id="NationalGeographicWildPoland.us" site_id="nat-geo-wild-77">National Geographic Wild Polska</channel>
     <channel lang="pl" xmltv_id="NauticalChannel.it" site_id="nautical-channel-116">Nautical Channel</channel>
     <channel lang="pl" xmltv_id="NHKWorldJapan.jp" site_id="nhk-world-tv-11">NHK World Japan</channel>
-    <channel lang="pl" xmltv_id="NickelodeonGermany.us" site_id="nick-488">Nickelodeon Deutschland</channel>
-    <channel lang="pl" xmltv_id="NickelodeonPoland.us" site_id="nickelodeon-42">Nickelodeon Polska</channel>
-    <channel lang="pl" xmltv_id="NickJrCentralEasternEurope.us" site_id="nick-jr-45">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="pl" xmltv_id="NickMusic.us" site_id="viva-polska-10">NickMusic</channel>
-    <channel lang="pl" xmltv_id="NicktoonsPoland.us" site_id="nickelodeon-hd-44">Nicktoons Polska</channel>
+    <channel lang="pl" xmltv_id="NickGermany.de" site_id="nick-488">Nickelodeon Deutschland</channel>
+    <channel lang="pl" xmltv_id="NickelodeonPoland.pl" site_id="nickelodeon-42">Nickelodeon Polska</channel>
+    <channel lang="pl" xmltv_id="NickJrPoland.pl" site_id="nick-jr-45">Nick Jr</channel>
+    <channel lang="pl" xmltv_id="NickMusicUS.us" site_id="viva-polska-10">NickMusic</channel>
+    <channel lang="pl" xmltv_id="NicktoonsPoland.pl" site_id="nickelodeon-hd-44">Nicktoons Polska</channel>
     <channel lang="pl" xmltv_id="NitroGermany.de" site_id="rtl-nitro-545">Nitro Deutschland</channel>
     <channel lang="pl" xmltv_id="NovelaTV.pl" site_id="novela-tv-461">Novela TV</channel>
     <channel lang="pl" xmltv_id="NowaTV.pl" site_id="nowa-tv-528">Nowa TV</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
index 371e65fb..68c9514e 100644
--- a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
@@ -84,8 +84,8 @@
     <channel lang="fr" xmltv_id="MyZenTV.fr" site_id="UID2317">MyZen.tv</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="UID50065">NGC F</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="UID0022">NGC Wild F</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="UID50314">nick F</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="UID2070">nick jr F</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="UID50314">nick F</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="UID2070">nick jr F</channel>
     <channel lang="fr" xmltv_id="Notele.be" site_id="UID2332">No Télé HD</channel>
     <channel lang="fr" xmltv_id="ParamountChannelFrance.us" site_id="UID2069">Paramount Channel</channel>
     <channel lang="fr" xmltv_id="PickxLiveFR.be" site_id="UID0679">PickxLive F HD</channel>
@@ -169,9 +169,9 @@
     <channel lang="nl" xmltv_id="MTVNL.us" site_id="UID50143">MTV N</channel>
     <channel lang="nl" xmltv_id="NationalGeographicNederland.us" site_id="UID50087">NGC N</channel>
     <channel lang="nl" xmltv_id="NationalGeographicWildEurope.us" site_id="UID0023">NGC Wild N</channel>
-    <channel lang="nl" xmltv_id="NickelodeonNederlandBelgie.us" site_id="UID50039">nick N</channel>
-    <channel lang="nl" xmltv_id="NickJrNetherland.us" site_id="UID50153">nick jr N</channel>
-    <channel lang="nl" xmltv_id="NicktoonsNetherland.us" site_id="UID50165">nick Toons</channel>
+    <channel lang="nl" xmltv_id="NickelodeonNetherlands.nl" site_id="UID50039">nick N</channel>
+    <channel lang="nl" xmltv_id="NickJrNetherlands.nl" site_id="UID50153">nick jr N</channel>
+    <channel lang="nl" xmltv_id="NicktoonsNetherlands.nl" site_id="UID50165">nick Toons</channel>
     <channel lang="nl" xmltv_id="Njam.be" site_id="UID0232">Njam! HD</channel>
     <channel lang="nl" xmltv_id="NPO1.nl" site_id="UID50047">NPO 1</channel>
     <channel lang="nl" xmltv_id="NPO2.nl" site_id="UID50080">NPO 2</channel>
diff --git a/sites/rev.bs/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
index 0c3e7f41..98edc72b 100644
--- a/sites/rev.bs/rev.bs_bs.channels.xml
+++ b/sites/rev.bs/rev.bs_bs.channels.xml
@@ -127,7 +127,7 @@
     <channel lang="en" xmltv_id="NBATV.us" site_id="730">NBA TV</channel>
     <channel lang="en" xmltv_id="NBCSN.us" site_id="717">NBCSN</channel>
     <channel lang="en" xmltv_id="NFLNetwork.us" site_id="711">NFL Network</channel>
-    <channel lang="en" xmltv_id="NickelodeonEast.us" site_id="303">Nickelodeon East</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSEast.us" site_id="303">Nickelodeon East</channel>
     <channel lang="en" xmltv_id="NickMusicUS.us" site_id="377">NickMusic US</channel>
     <channel lang="en" xmltv_id="OneAmericaNewsNetwork.us" site_id="406">One America News Network</channel>
     <channel lang="en" xmltv_id="OneCaribbeanTV.us" site_id="382">One Caribbean TV</channel>
@@ -156,7 +156,7 @@
     <channel lang="en" xmltv_id="TBNUS.us" site_id="650">TBN US</channel>
     <channel lang="en" xmltv_id="TBSEast.us" site_id="225">TBS East</channel>
     <channel lang="en" xmltv_id="TCMAmericaLatina.us" site_id="492">TCM América Latina</channel>
-    <channel lang="en" xmltv_id="TeenNickEast.us" site_id="315">TeenNick East</channel>
+    <channel lang="en" xmltv_id="TeenNickUSEast.us" site_id="315">TeenNick East</channel>
     <channel lang="en" xmltv_id="TelePacific.ht" site_id="384">Tele Pacific</channel>
     <channel lang="en" xmltv_id="TempoNetworks.us" site_id="381">Tempo Networks</channel>
     <channel lang="en" xmltv_id="TheAfricaChannel.us" site_id="269">The Africa Channel</channel>
diff --git a/sites/siba.com.co/siba.com.co_co.channels.xml b/sites/siba.com.co/siba.com.co_co.channels.xml
index 36f352a5..db54a4e8 100644
--- a/sites/siba.com.co/siba.com.co_co.channels.xml
+++ b/sites/siba.com.co/siba.com.co_co.channels.xml
@@ -61,9 +61,9 @@
     <channel lang="es" xmltv_id="NatGeoKids.us" site_id="1066">Nat Geo Kids</channel>
     <channel lang="es" xmltv_id="NationalGeographicChile.us" site_id="550">National Geographic Chile</channel>
     <channel lang="es" xmltv_id="NationalGeographicWildLatin.us" site_id="548">National Geographic Wild Latin</channel>
-    <channel lang="es" xmltv_id="NickelodeonCentro.us" site_id="552">Nickelodeon Centro</channel>
+    <channel lang="es" xmltv_id="NickelodeonLatinAmerica.us" site_id="552">Nickelodeon Centro</channel>
     <channel lang="es" xmltv_id="NickJrLatinAmerica.us" site_id="551">Nick Jr Latin America</channel>
-    <channel lang="es" xmltv_id="NickMusic.us" site_id="745">NickMusic</channel>
+    <channel lang="es" xmltv_id="NickMusicUS.us" site_id="745">NickMusic</channel>
     <channel lang="es" xmltv_id="NTN24.co" site_id="554">NTN 24</channel>
     <channel lang="es" xmltv_id="ParamountNetworkLatinAmerica.us" site_id="937">Paramount Network Latin America</channel>
     <channel lang="es" xmltv_id="PasionesLatinAmerica.us" site_id="555">Pasiones Latinoamérica</channel>
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index 675e58e6..8b3e65da 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -161,10 +161,10 @@
     <channel lang="en" xmltv_id="NationalGeographicUK.us" site_id="4031">National Geographic UK</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildUK.us" site_id="4025">National Geographic Wild UK</channel>
     <channel lang="en" xmltv_id="NeoNewsHD.pk" site_id="3722">Neo News HD</channel>
-    <channel lang="en" xmltv_id="NickJrTooUK.us" site_id="4340">Nick Jr Too UK</channel>
-    <channel lang="en" xmltv_id="NickJrUK.us" site_id="4039">Nick Jr UK</channel>
-    <channel lang="en" xmltv_id="NickToonsUK.us" site_id="1849">NickToons UK</channel>
-    <channel lang="en" xmltv_id="NickelodeonUK.us" site_id="4069">Nickelodeon UK</channel>
+    <channel lang="en" xmltv_id="NickJrTooUK.uk" site_id="4340">Nick Jr Too UK</channel>
+    <channel lang="en" xmltv_id="NickJrUK.uk" site_id="4039">Nick Jr UK</channel>
+    <channel lang="en" xmltv_id="NicktoonsUK.uk" site_id="1849">NickToons UK</channel>
+    <channel lang="en" xmltv_id="NickelodeonUK.uk" site_id="4069">Nickelodeon UK</channel>
     <channel lang="en" xmltv_id="NoorTV.uk" site_id="3715">Noor TV</channel>
     <channel lang="en" xmltv_id="Now70s.uk" site_id="3403">Now 70&apos;s</channel>
     <channel lang="en" xmltv_id="Now80s.uk" site_id="4541">Now 80&apos;s</channel>
diff --git a/sites/sky.de/sky.de_de.channels.xml b/sites/sky.de/sky.de_de.channels.xml
index afacbac7..68f7a319 100644
--- a/sites/sky.de/sky.de_de.channels.xml
+++ b/sites/sky.de/sky.de_de.channels.xml
@@ -30,8 +30,8 @@
     <channel lang="de" xmltv_id="MotorvisionTV.de" site_id="52">Motorvision TV</channel>
     <channel lang="de" xmltv_id="NationalGeographicGermany.us" site_id="81">National Geographic Deutschland</channel>
     <channel lang="de" xmltv_id="NationalGeographicWildGermany.us" site_id="88">National Geographic Wild Deutschland</channel>
-    <channel lang="de" xmltv_id="NickJrGermany.us" site_id="783">Nick Jr Deutschland</channel>
-    <channel lang="de" xmltv_id="NicktoonsGermany.us" site_id="798">Nicktoons Deutschland</channel>
+    <channel lang="de" xmltv_id="NickJrGermany.de" site_id="783">Nick Jr Deutschland</channel>
+    <channel lang="de" xmltv_id="NicktoonsGermany.de" site_id="798">Nicktoons Deutschland</channel>
     <channel lang="de" xmltv_id="RomanceTVGermany.de" site_id="16">Romance TV Deutschland</channel>
     <channel lang="de" xmltv_id="SkyAtlantic.de" site_id="2">Sky Atlantic</channel>
     <channel lang="de" xmltv_id="SkyCinemaAction.de" site_id="59">Sky Cinema Action</channel>
diff --git a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
index dfb118ac..efa5dacc 100644
--- a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
+++ b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
@@ -168,9 +168,9 @@
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="243">National Geographic</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="719">National Geographic Wild</channel>
     <channel lang="fr" xmltv_id="NauticalChannel.it" site_id="415">Nautical Channel</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="473">Nickelodéon</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="888">Nickelodeon Junior</channel>
-    <channel lang="fr" xmltv_id="NickelodeonNederlandBelgie.us" site_id="1968">Nickelodéon Wallonia</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="473">Nickelodéon</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="888">Nickelodeon Junior</channel>
+    <channel lang="fr" xmltv_id="NickelodeonNetherlands.nl" site_id="1968">Nickelodéon Wallonia</channel>
     <channel lang="fr" xmltv_id="NollywoodTV.fr" site_id="1461">Nollywood TV</channel>
     <channel lang="fr" xmltv_id="NonStopPeopleFrance.fr" site_id="1408">Non Stop People HD</channel>
     <channel lang="fr" xmltv_id="Notele.be" site_id="1833">NoTélé</channel>
diff --git a/sites/telenettv.be/telenettv.be_be.channels.xml b/sites/telenettv.be/telenettv.be_be.channels.xml
index cab8b1e4..11dd294f 100644
--- a/sites/telenettv.be/telenettv.be_be.channels.xml
+++ b/sites/telenettv.be/telenettv.be_be.channels.xml
@@ -64,8 +64,8 @@
     <channel lang="be" xmltv_id="MTV00s.us" site_id="vh1">MTV 00s</channel>
     <channel lang="be" xmltv_id="MTVLive.us" 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="NickelodeonFrance.us" site_id="nickelodeonfr">Nickelodeon France</channel>
-    <channel lang="be" xmltv_id="NickJrEurope.us" site_id="nickjr">Nick Jr 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>
     <channel lang="be" xmltv_id="NPO1.nl" site_id="ned1">NPO 1</channel>
     <channel lang="be" xmltv_id="NPO2.nl" site_id="ned2">NPO 2</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index 0b51ecef..abced82e 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -76,9 +76,9 @@
     <channel lang="en" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
     <channel lang="en" xmltv_id="NationalGeographicChannelHDEurope.us" site_id="19">National Geographic Channel HD Europe</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildEurope.us" site_id="79">National Geographic Wild Europe</channel>
-    <channel lang="en" xmltv_id="NickelodeonCIS.us" site_id="58">Nickelodeon CIS</channel>
-    <channel lang="en" xmltv_id="NickJrScandinavia.us" site_id="1300">Nick Jr Scandinavia</channel>
-    <channel lang="en" xmltv_id="NicktoonsScandinavia.us" site_id="1301">Nicktoons Scandinavia</channel>
+    <channel lang="en" xmltv_id="NickelodeonCIS.ru" site_id="58">Nickelodeon CIS</channel>
+    <channel lang="en" xmltv_id="NickJrScandinavia.nl" site_id="1300">Nick Jr Scandinavia</channel>
+    <channel lang="en" xmltv_id="NicktoonsScandinavia.nl" site_id="1301">Nicktoons Scandinavia</channel>
     <channel lang="en" xmltv_id="NTV.de" site_id="145">N-TV</channel>
     <channel lang="en" xmltv_id="NTVMirBaltic.ru" site_id="14">NTV Mir Baltic</channel>
     <channel lang="en" xmltv_id="NTVSerial.ru" site_id="1289">NTV Serial</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index 7dd5ff40..5db8ce72 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
@@ -76,9 +76,9 @@
     <channel lang="et" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
     <channel lang="et" xmltv_id="NationalGeographicChannelHDEurope.us" site_id="19">National Geographic Channel HD Europe</channel>
     <channel lang="et" xmltv_id="NationalGeographicWildEurope.us" site_id="79">National Geographic Wild Europe</channel>
-    <channel lang="et" xmltv_id="NickelodeonCIS.us" site_id="58">Nickelodeon CIS</channel>
-    <channel lang="et" xmltv_id="NickJrScandinavia.us" site_id="1300">Nick Jr Scandinavia</channel>
-    <channel lang="et" xmltv_id="NicktoonsScandinavia.us" site_id="1301">Nicktoons Scandinavia</channel>
+    <channel lang="et" xmltv_id="NickelodeonCIS.ru" site_id="58">Nickelodeon CIS</channel>
+    <channel lang="et" xmltv_id="NickJrScandinavia.nl" site_id="1300">Nick Jr Scandinavia</channel>
+    <channel lang="et" xmltv_id="NicktoonsScandinavia.nl" site_id="1301">Nicktoons Scandinavia</channel>
     <channel lang="et" xmltv_id="NTV.de" site_id="145">N-TV</channel>
     <channel lang="et" xmltv_id="NTVMirBaltic.ru" site_id="14">NTV Mir Baltic</channel>
     <channel lang="et" xmltv_id="NTVSerial.ru" site_id="1289">NTV Serial</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index 1b700ad4..68d39a2d 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
@@ -76,9 +76,9 @@
     <channel lang="ru" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
     <channel lang="ru" xmltv_id="NationalGeographicChannelHDEurope.us" site_id="19">National Geographic Channel HD Europe</channel>
     <channel lang="ru" xmltv_id="NationalGeographicWildEurope.us" site_id="79">National Geographic Wild Europe</channel>
-    <channel lang="ru" xmltv_id="NickelodeonCIS.us" site_id="58">Nickelodeon CIS</channel>
-    <channel lang="ru" xmltv_id="NickJrScandinavia.us" site_id="1300">Nick Jr Scandinavia</channel>
-    <channel lang="ru" xmltv_id="NicktoonsScandinavia.us" site_id="1301">Nicktoons Scandinavia</channel>
+    <channel lang="ru" xmltv_id="NickelodeonCIS.ru" site_id="58">Nickelodeon CIS</channel>
+    <channel lang="ru" xmltv_id="NickJrScandinavia.nl" site_id="1300">Nick Jr Scandinavia</channel>
+    <channel lang="ru" xmltv_id="NicktoonsScandinavia.nl" site_id="1301">Nicktoons Scandinavia</channel>
     <channel lang="ru" xmltv_id="NTV.de" site_id="145">N-TV</channel>
     <channel lang="ru" xmltv_id="NTVMirBaltic.ru" site_id="14">NTV Mir Baltic</channel>
     <channel lang="ru" xmltv_id="NTVSerial.ru" site_id="1289">NTV Serial</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 9a9621a6..e475634e 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -61,8 +61,8 @@
     <channel lang="id" xmltv_id="MNCTV.id" site_id="MNC">MNCTV</channel>
     <channel lang="id" xmltv_id="MTVLive.us" site_id="MTLU">MTV Live</channel>
     <channel lang="id" xmltv_id="NHKWorldPremium.jp" site_id="NHP">NHK World Premium</channel>
-    <channel lang="id" xmltv_id="NickJrAsia.us" site_id="NCJ">Nick Jr.</channel>
-    <channel lang="id" xmltv_id="NickelodeonSouthEastAsia.us" site_id="NCK">Nickelodeon</channel>
+    <channel lang="id" xmltv_id="NickJrAsia.sg" site_id="NCJ">Nick Jr.</channel>
+    <channel lang="id" xmltv_id="NickelodeonAsia.sg" site_id="NCK">Nickelodeon</channel>
     <channel lang="id" xmltv_id="OneTV.id" site_id="ONE">ONE HD</channel>
     <channel lang="id" xmltv_id="RCTI.id" site_id="RCTI">RCTI</channel>
     <channel lang="id" xmltv_id="RockEntertainment.sg" site_id="RTLK">Rock Entertainment HD</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 d11fe61b..2fa8db45 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -103,8 +103,8 @@
     <channel lang="de" xmltv_id="NationalGeographicGermany.us" site_id="278">National Geographic Deutschland</channel>
     <channel lang="de" xmltv_id="NationalGeographicWildGermany.us" site_id="282">National Geographic Wild Deutschland</channel>
     <channel lang="de" xmltv_id="NDRFernsehenHamburg.de" site_id="286">NDR Fernsehen Hamburg</channel>
-    <channel lang="de" xmltv_id="NickelodeonGermany.us" site_id="289">7+ &amp; Nick Schweiz</channel>
-    <channel lang="de" xmltv_id="NicktoonsGermany.us" site_id="1605">Nicktoons Deutschland</channel>
+    <channel lang="de" xmltv_id="NickGermany.de" site_id="289">7+ &amp; Nick Schweiz</channel>
+    <channel lang="de" xmltv_id="NicktoonsGermany.de" site_id="1605">Nicktoons Deutschland</channel>
     <channel lang="de" xmltv_id="NitroGermany.de" site_id="363">Nitro Deutschland</channel>
     <channel lang="de" xmltv_id="NTV.de" site_id="297">N-TV</channel>
     <channel lang="de" xmltv_id="One.de" site_id="147">One</channel>
@@ -377,9 +377,9 @@
     <channel lang="fr" xmltv_id="MySportsOneFrench.ch" site_id="1557">MySports One Français</channel>
     <channel lang="fr" xmltv_id="NationalGeographicFrance.us" site_id="279">National Geographic France</channel>
     <channel lang="fr" xmltv_id="NationalGeographicWildFrance.us" site_id="283">National Geographic Wild France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonFrance.us" site_id="291">Nickelodeon France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonJuniorFrance.us" site_id="290">Nickelodeon Junior France</channel>
-    <channel lang="fr" xmltv_id="NickelodeonTeen.us" site_id="1767">Nickelodeon Teen</channel>
+    <channel lang="fr" xmltv_id="NickelodeonFrance.fr" site_id="291">Nickelodeon France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonJunior.fr" site_id="290">Nickelodeon Junior France</channel>
+    <channel lang="fr" xmltv_id="NickelodeonTeen.fr" site_id="1767">Nickelodeon Teen</channel>
     <channel lang="fr" xmltv_id="NovelasTV.fr" site_id="1731">Novelas TV</channel>
     <channel lang="fr" xmltv_id="NRJ12.fr" site_id="293">NRJ 12</channel>
     <channel lang="fr" xmltv_id="NRTV.ch" site_id="294">NRTV</channel>
diff --git a/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml b/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
index 9d140958..0be71904 100644
--- a/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
@@ -75,8 +75,8 @@
     <channel lang="bg" xmltv_id="MTVHitsUK.us" site_id="251">MTV Hits UK</channel>
     <channel lang="bg" xmltv_id="NationalGeographicBulgaria.us" site_id="27">National Geographic Bulgaria</channel>
     <channel lang="bg" xmltv_id="NationalGeographicWildBulgaria.us" site_id="150">National Geographic Wild Bulgaria</channel>
-    <channel lang="bg" xmltv_id="NickelodeonEurope.us" site_id="232">Nickelodeon Europe</channel>
-    <channel lang="bg" xmltv_id="NickJrCentralEasternEurope.us" site_id="253">Nick Jr Central &amp; Eastern Europe</channel>
+    <channel lang="bg" xmltv_id="NickelodeonBulgaria.bg" site_id="232">Nickelodeon</channel>
+    <channel lang="bg" xmltv_id="NickJrBulgaria.bg" site_id="253">Nick Jr</channel>
     <channel lang="bg" xmltv_id="NovaNews.bg" site_id="19">Nova News</channel>
     <channel lang="bg" xmltv_id="NovaSport.bg" site_id="167">Nova Sport</channel>
     <channel lang="bg" xmltv_id="NovaTV.bg" site_id="28">Nova TV</channel>
diff --git a/sites/tv.nu/tv.nu_se.channels.xml b/sites/tv.nu/tv.nu_se.channels.xml
index 5a7f4e33..0631d9ab 100644
--- a/sites/tv.nu/tv.nu_se.channels.xml
+++ b/sites/tv.nu/tv.nu_se.channels.xml
@@ -80,9 +80,9 @@
     <channel lang="sv" xmltv_id="Nelonen.fi" site_id="nelonen">Nelonen</channel>
     <channel lang="sv" xmltv_id="NFLNetwork.us" site_id="nfl-network">NFL Network</channel>
     <channel lang="sv" xmltv_id="NHKWorldJapan.jp" site_id="nhk-world-europe">NHK World Europe</channel>
-    <channel lang="sv" xmltv_id="NickelodeonSverige.us" site_id="nickelodeon">Nickelodeon</channel>
-    <channel lang="sv" xmltv_id="NickJrScandinavia.us" site_id="nick-jr">Nick JR</channel>
-    <channel lang="sv" xmltv_id="NicktoonsScandinavia.us" site_id="nicktoons">Nicktoons</channel>
+    <channel lang="sv" xmltv_id="NickelodeonScandinavia.nl" site_id="nickelodeon">Nickelodeon</channel>
+    <channel lang="sv" xmltv_id="NickJrScandinavia.nl" site_id="nick-jr">Nick JR</channel>
+    <channel lang="sv" xmltv_id="NicktoonsScandinavia.nl" site_id="nicktoons">Nicktoons</channel>
     <channel lang="sv" xmltv_id="NRK1.no" site_id="nrk1">NRK1</channel>
     <channel lang="sv" xmltv_id="NRK2.no" site_id="nrk2">NRK2</channel>
     <channel lang="sv" xmltv_id="NRK3.no" site_id="nrk3">NRK3</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 364ecf75..96322340 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -37,8 +37,8 @@
     <channel lang="th" xmltv_id="NBATV.us" site_id="nba-tv">NBA TV</channel>
     <channel lang="th" xmltv_id="NBT2.th" site_id="nbt">NBT 2</channel>
     <channel lang="th" xmltv_id="NHKWorldPremium.jp" site_id="nhk-world-tv">NHK World Premium</channel>
-    <channel lang="th" xmltv_id="NickelodeonSouthEastAsia.us" site_id="nickelodeon">Nickelodeon South East Asia</channel>
-    <channel lang="th" xmltv_id="NickJrAsia.us" site_id="hybrid-nickjr-hd">Nick Jr Asia</channel>
+    <channel lang="th" xmltv_id="NickelodeonAsia.sg" site_id="nickelodeon">Nickelodeon South East Asia</channel>
+    <channel lang="th" xmltv_id="NickJrAsia.sg" site_id="hybrid-nickjr-hd">Nick Jr Asia</channel>
     <channel lang="th" xmltv_id="One31.th" site_id="one-hd">One 31</channel>
     <channel lang="th" xmltv_id="OutdoorChannelInternational.us" site_id="hybrid-outdoor-channel">Outdoor Channel International</channel>
     <channel lang="th" xmltv_id="ParamountNetworkAsia.us" site_id="hybrid-paramount-hd">Paramount Network Asia</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
index 866a4dc5..3f92e1cb 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -150,8 +150,8 @@
     <channel lang="ru" xmltv_id="NationalGeographicWildRussia.us" site_id="213#nat-geo-wild-459">National Geographic Wild Russia</channel>
     <channel lang="ru" xmltv_id="Nauka.ru" site_id="213#nauka-674">Nauka</channel>
     <channel lang="ru" xmltv_id="NHKWorldJapan.jp" site_id="213#nhk-world-japan-734">NHK World Japan</channel>
-    <channel lang="ru" xmltv_id="NickelodeonCIS.us" site_id="213#nickelodeon-596">Nickelodeon CIS</channel>
-    <channel lang="ru" xmltv_id="NickJrCIS.us" site_id="213#nick-jr-731">Nick Jr CIS</channel>
+    <channel lang="ru" xmltv_id="NickelodeonCIS.ru" site_id="213#nickelodeon-596">Nickelodeon CIS</channel>
+    <channel lang="ru" xmltv_id="NickJrCIS.ru" site_id="213#nick-jr-731">Nick Jr CIS</channel>
     <channel lang="ru" xmltv_id="NikaTV.ru" site_id="213#nika-tv-129">Nika TV</channel>
     <channel lang="ru" xmltv_id="Nostalgia.ru" site_id="213#nostalgiya-691">Nostalgia</channel>
     <channel lang="ru" xmltv_id="NoviyMir.de" site_id="213#novyy-mir-1220">Noviy Mir</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index acf8f0aa..9a1cfdd0 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -155,8 +155,8 @@
     <channel lang="sl" xmltv_id="NationalGeographicWildEurope.us" site_id="1000167">National Geographic Wild Europe</channel>
     <channel lang="sl" xmltv_id="NetTV.si" site_id="12">Net TV</channel>
     <channel lang="sl" xmltv_id="NHKWorldJapan.jp" site_id="1000102">NHK World Japan</channel>
-    <channel lang="sl" xmltv_id="NickelodeonEurope.us" site_id="1000301">Nickelodeon Europe</channel>
-    <channel lang="sl" xmltv_id="NickJrCentralEasternEurope.us" site_id="1000426">Nick Jr Central &amp; Eastern Europe</channel>
+    <channel lang="sl" xmltv_id="NickelodeonSlovenia.si" site_id="1000301">Nickelodeon</channel>
+    <channel lang="sl" xmltv_id="NickJrSlovenia.si" site_id="1000426">Nick Jr</channel>
     <channel lang="sl" xmltv_id="Nova24TV.si" site_id="1000432">Nova 24 TV</channel>
     <channel lang="sl" xmltv_id="Nova24TV2.si" site_id="1000531">Nova 24 TV 2</channel>
     <channel lang="sl" xmltv_id="NTVICKakanj.ba" site_id="1000235">NTV IC Kakanj</channel>
diff --git a/sites/tvgid.ua/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
index b9b7a675..42596025 100644
--- a/sites/tvgid.ua/tvgid.ua_ua.channels.xml
+++ b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
@@ -61,7 +61,7 @@
     <channel lang="uk" xmltv_id="NasheNovoeKino.ru" site_id="nashe_novoe-kino">Nashe Novoe Kino</channel>
     <channel lang="uk" xmltv_id="NationalGeographicRussia.us" site_id="national_geographic">National Geographic Russia</channel>
     <channel lang="uk" xmltv_id="NationalGeographicWildRussia.us" site_id="nat_geo_wild">National Geographic Wild Russia</channel>
-    <channel lang="uk" xmltv_id="NickelodeonCIS.us" site_id="nickelodeon_sng">Nickelodeon CIS</channel>
+    <channel lang="uk" xmltv_id="NickelodeonCIS.ru" site_id="nickelodeon_sng">Nickelodeon CIS</channel>
     <channel lang="uk" xmltv_id="NLOTV.ua" site_id="nlo_tv">NLO TV</channel>
     <channel lang="uk" xmltv_id="NovyKanal.ua" site_id="noviy_kanal">Novy Kanal</channel>
     <channel lang="uk" xmltv_id="NTN.ua" site_id="ntn">NTN</channel>
diff --git a/sites/tvguide.com/tvguide.com_us.channels.xml b/sites/tvguide.com/tvguide.com_us.channels.xml
index d7bd9aff..8380c794 100644
--- a/sites/tvguide.com/tvguide.com_us.channels.xml
+++ b/sites/tvguide.com/tvguide.com_us.channels.xml
@@ -58,7 +58,7 @@
     <channel lang="en" xmltv_id="NBCEast.us" site_id="9100001138#9233009876">NBC East</channel>
     <channel lang="en" xmltv_id="NBCSN.us" site_id="9100001138#9233000030">NBCSN</channel>
     <channel lang="en" xmltv_id="NewsNationEast.us" site_id="9100001138#9233013251">NewsNation East</channel>
-    <channel lang="en" xmltv_id="NickelodeonEast.us" site_id="9100001138#9200006939">Nickelodeon East</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSEast.us" site_id="9100001138#9200006939">Nickelodeon East</channel>
     <channel lang="en" xmltv_id="OprahWinfreyNetworkEast.us" site_id="9100001138#9200002736">Oprah Winfrey Network East</channel>
     <channel lang="en" xmltv_id="OxygenEast.us" site_id="9100001138#9200004949">Oxygen East</channel>
     <channel lang="en" xmltv_id="ParamountNetworkEast.us" site_id="9100001138#9233013810">Paramount Network East</channel>
diff --git a/sites/tvheute.at/tvheute.at_at.channels.xml b/sites/tvheute.at/tvheute.at_at.channels.xml
index 2aceea33..87d72ded 100644
--- a/sites/tvheute.at/tvheute.at_at.channels.xml
+++ b/sites/tvheute.at/tvheute.at_at.channels.xml
@@ -16,7 +16,7 @@
     <channel lang="de" xmltv_id="KIKA.de" site_id="kika">KIKA</channel>
     <channel lang="de" xmltv_id="MDRFernsehenSachsenAnhalt.de" site_id="mdr">MDR Fernsehen Sachsen-Anhalt</channel>
     <channel lang="de" xmltv_id="NDRFernsehenNiedersachsen.de" site_id="ndr">NDR Fernsehen Niedersachsen</channel>
-    <channel lang="de" xmltv_id="NickelodeonAustria.us" site_id="nick">Nickelodeon Austria</channel>
+    <channel lang="de" xmltv_id="NickAustria.at" site_id="nick">Nickelodeon Austria</channel>
     <channel lang="de" xmltv_id="NitroAustria.de" site_id="nitro">Nitro Austria</channel>
     <channel lang="de" xmltv_id="NTVAustria.de" site_id="ntv">N-TV Austria</channel>
     <channel lang="de" xmltv_id="Oe24TV.at" site_id="oe24tv">Oe24 TV</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
index e1eb57df..da53731e 100644
--- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
@@ -57,8 +57,8 @@
     <channel lang="hu" xmltv_id="MuzsikaTV.hu" site_id="217">Muzsika TV</channel>
     <channel lang="hu" xmltv_id="NationalGeographicHungaryCzechia.us" site_id="14">National Geographic Hungary &amp; Czechia</channel>
     <channel lang="hu" xmltv_id="NationalGeographicWildHungary.us" site_id="141">National Geographic Wild Hungary</channel>
-    <channel lang="hu" xmltv_id="NickelodeonMagyarorszag.us" site_id="41">Nickelodeon Magyarország</channel>
-    <channel lang="hu" xmltv_id="NickJrCentralEasternEurope.us" site_id="236">Nick Jr Central &amp; Eastern Europe</channel>
+    <channel lang="hu" xmltv_id="NickelodeonHungary.hu" site_id="41">Nickelodeon</channel>
+    <channel lang="hu" xmltv_id="NickJrHungary.hu" site_id="236">Nick Jr</channel>
     <channel lang="hu" xmltv_id="OzoneTV.hu" site_id="213">Ozone TV</channel>
     <channel lang="hu" xmltv_id="ParamountNetworkHungary.us" site_id="257">Paramount Network Hungary</channel>
     <channel lang="hu" xmltv_id="Prime.hu" site_id="215">Prime</channel>
@@ -77,7 +77,7 @@
     <channel lang="hu" xmltv_id="Sport2Hungary.hu" site_id="44">Sport 2 Hungary</channel>
     <channel lang="hu" xmltv_id="Story4.hu" site_id="228">Story 5</channel>
     <channel lang="hu" xmltv_id="SuperTV2.hu" site_id="244">Super TV 2</channel>
-    <channel lang="hu" xmltv_id="TeenNickHungary.us" site_id="312">TeenNick Hungary</channel>
+    <channel lang="hu" xmltv_id="TeenNickHungary.hu" site_id="312">TeenNick Hungary</channel>
     <channel lang="hu" xmltv_id="TheFishingHuntingChannel.hu" site_id="176">The Fishing &amp; Hunting Channel</channel>
     <channel lang="hu" xmltv_id="TLCPanRegional.us" site_id="233">TLC Pan Regional</channel>
     <channel lang="hu" xmltv_id="TravelChannelEurope.us" site_id="84">Travel Channel Europe</channel>
diff --git a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
index cde0e63a..b8a86253 100644
--- a/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
+++ b/sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml
@@ -80,7 +80,7 @@
     <channel lang="tr" xmltv_id="NationalGeographicTurkey.us" site_id="2799">National Geographic Türkiye</channel>
     <channel lang="tr" xmltv_id="NationalGeographicWildTurkey.us" site_id="139">National Geographic Wild Türkiye</channel>
     <channel lang="tr" xmltv_id="NBATV.us" site_id="18">NBA TV</channel>
-    <channel lang="tr" xmltv_id="NicktoonsTurkey.us" site_id="2739">Nicktoons Türkiye</channel>
+    <channel lang="tr" xmltv_id="NicktoonsTurkey.tr" site_id="2739">Nicktoons Türkiye</channel>
     <channel lang="tr" xmltv_id="NTV.tr" site_id="81">NTV</channel>
     <channel lang="tr" xmltv_id="Number1Ask.tr" site_id="33">Number 1 Aşk</channel>
     <channel lang="tr" xmltv_id="Number1Damar.tr" site_id="41">Number 1 Damar</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_ba.channels.xml b/sites/tvprofil.com/tvprofil.com_ba.channels.xml
index 19fc67c0..79375d9d 100644
--- a/sites/tvprofil.com/tvprofil.com_ba.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_ba.channels.xml
@@ -76,9 +76,6 @@
     <channel lang="hr" xmltv_id="N1BosnaiHercegovina.rs" site_id="ba/tvprogram#n1">N1 Bosna i Hercegovina</channel>
     <channel lang="hr" xmltv_id="N1Hrvatska.rs" site_id="ba/tvprogram#n1-hr">N1 Hrvatska</channel>
     <channel lang="hr" xmltv_id="N1Srbija.rs" site_id="ba/tvprogram#n1-rs">N1 Srbija</channel>
-    <channel lang="hr" xmltv_id="NickelodeonEurope.us" site_id="ba/tvprogram#nickelodeon-rs">Nickelodeon Europe</channel>
-    <channel lang="hr" xmltv_id="NickJrCentralEasternEurope.us" site_id="ba/tvprogram#nick-jr">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="hr" xmltv_id="NicktoonsAdria.us" site_id="ba/tvprogram#comedy-central-extra">Nicktoons Adria</channel>
     <channel lang="hr" xmltv_id="NovaBH.rs" site_id="ba/tvprogram#nova-bh">Nova BH</channel>
     <channel lang="hr" xmltv_id="NovaS.rs" site_id="ba/tvprogram#nova-s">Nova S</channel>
     <channel lang="hr" xmltv_id="NovaSport.rs" site_id="ba/tvprogram#nova-sport-rs">Nova Sport</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_bg.channels.xml b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
index debf82f1..804a9f79 100644
--- a/sites/tvprofil.com/tvprofil.com_bg.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
@@ -70,7 +70,7 @@
     <channel lang="hr" xmltv_id="HBOAdria.us" site_id="bg/tv-programa#hbo-bg">HBO Adria</channel>
     <channel lang="hr" xmltv_id="NationalGeographicBulgaria.us" site_id="bg/tv-programa#national-geographic-bg">National Geographic Bulgaria</channel>
     <channel lang="hr" xmltv_id="NationalGeographicWildBulgaria.us" site_id="bg/tv-programa#nat-geo-wild-bg">National Geographic Wild Bulgaria</channel>
-    <channel lang="hr" xmltv_id="NickelodeonMagyarorszag.us" site_id="bg/tv-programa#nicktoons-hu">Nickelodeon Magyarország</channel>
+    <channel lang="hr" xmltv_id="NicktoonsHungary.hu" site_id="bg/tv-programa#nicktoons-hu">Nicktoons Hungary</channel>
     <channel lang="hr" xmltv_id="PassionXXX.nl" site_id="bg/tv-programa#passion-xxx">Passion XXX</channel>
     <channel lang="hr" xmltv_id="RingTV.sk" site_id="bg/tv-programa#ring-tv">Ring TV</channel>
     <channel lang="hr" xmltv_id="XXL.fr" site_id="bg/tv-programa#xxl">XXL</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_hu.channels.xml b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
index 1d44eff3..1f5e0c50 100644
--- a/sites/tvprofil.com/tvprofil.com_hu.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
@@ -38,7 +38,7 @@
     <channel lang="hr" xmltv_id="MuzsikaTV.hu" site_id="hu/tvmusor#muzsika-tv">Muzsika TV</channel>
     <channel lang="hr" xmltv_id="NationalGeographicHungaryCzechia.us" site_id="hu/tvmusor#national-geographic-hu">National Geographic Hungary &amp; Czechia</channel>
     <channel lang="hr" xmltv_id="NationalGeographicWildHungary.us" site_id="hu/tvmusor#nat-geo-wild-hu">National Geographic Wild Hungary</channel>
-    <channel lang="hr" xmltv_id="NickJrHungary.us" site_id="hu/tvmusor#nick-jr-hu">Nick Jr Hungary</channel>
+    <channel lang="hr" xmltv_id="NickJrHungary.hu" site_id="hu/tvmusor#nick-jr-hu">Nick Jr Hungary</channel>
     <channel lang="hr" xmltv_id="PaxTV.hu" site_id="hu/tvmusor#pax-tv">Pax TV</channel>
     <channel lang="hr" xmltv_id="Prime.hu" site_id="hu/tvmusor#prime">Prime</channel>
     <channel lang="hr" xmltv_id="RTLGold.hu" site_id="hu/tvmusor#rtl-gold">RTL Gold</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index bb29291e..7e4fb670 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -1198,13 +1198,13 @@
     <channel lang="en" xmltv_id="NFLRedZone.us" site_id="89351">NFL Red Zone</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="59155">NHK World (US-National)</channel>
     <channel lang="en" xmltv_id="NHLNetwork.us" site_id="58570">NHL Network</channel>
-    <channel lang="en" xmltv_id="NickelodeonEast.us" site_id="11006">Nickelodeon East</channel>
-    <channel lang="en" xmltv_id="NickelodeonWest.us" site_id="11007">Nickelodeon West</channel>
-    <channel lang="en" xmltv_id="NickJrEast.us" site_id="19211">Nick Jr East</channel>
-    <channel lang="en" xmltv_id="NickJrWest.us" site_id="77996">Nick Jr West</channel>
-    <channel lang="en" xmltv_id="NickMusic.us" site_id="90209">NickMusic</channel>
-    <channel lang="en" xmltv_id="NicktoonsEast.us" site_id="30420">Nicktoons East</channel>
-    <channel lang="en" xmltv_id="NicktoonsWest.us" site_id="91718">Nicktoons West</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSEast.us" site_id="11006">Nickelodeon East</channel>
+    <channel lang="en" xmltv_id="NickelodeonUSWest.us" site_id="11007">Nickelodeon West</channel>
+    <channel lang="en" xmltv_id="NickJrUSEast.us" site_id="19211">Nick Jr East</channel>
+    <channel lang="en" xmltv_id="NickJrUSWest.us" site_id="77996">Nick Jr West</channel>
+    <channel lang="en" xmltv_id="NickMusicUS.us" site_id="90209">NickMusic</channel>
+    <channel lang="en" xmltv_id="NicktoonsUSEast.us" site_id="30420">Nicktoons East</channel>
+    <channel lang="en" xmltv_id="NicktoonsUSWest.us" site_id="91718">Nicktoons West</channel>
     <channel lang="en" xmltv_id="NRBTV.us" site_id="49097">NRBTV</channel>
     <channel lang="en" xmltv_id="NTDTVEast.us" site_id="11253">NTD TV</channel>
     <channel lang="en" xmltv_id="NTV.bd" site_id="80160">NTV</channel>
@@ -1235,7 +1235,7 @@
     <channel lang="en" xmltv_id="PlayboyTVLatinAmerica.us" site_id="16788">Playboy TV Latin America</channel>
     <channel lang="en" xmltv_id="PlutoTVDoctorWhoClassic.us" site_id="120086">Classic Doctor Who (Pluto)</channel>
     <channel lang="en" xmltv_id="PlutoTVGameShowCentral.us" site_id="116474">Game Show Central (Pluto)</channel>
-    <channel lang="en" xmltv_id="PlutoTVNick.us" site_id="121301">Nick on PlutoTV</channel>
+    <channel lang="en" xmltv_id="NickPlutoTV.us" site_id="121301">Nick on PlutoTV</channel>
     <channel lang="en" xmltv_id="PlutoTVSPORTBeINSportsXtra.us" site_id="113143">beIN Sports Xtra (English-USA)</channel>
     <channel lang="en" xmltv_id="PlutoTVBlackNewsChannel.us" site_id="116018">BNCGO (Pluto)</channel>
     <channel lang="en" xmltv_id="PlutoTVTotallyTurtles.us" site_id="121107">Totally Turtles</channel>
@@ -1341,7 +1341,7 @@
     <channel lang="en" xmltv_id="TCMUS.us" site_id="12852">TCM</channel>
     <channel lang="en" xmltv_id="TCT.us" site_id="93446">TCT</channel>
     <channel lang="en" xmltv_id="Teach.us" site_id="16027">Teach</channel>
-    <channel lang="en" xmltv_id="TeenNickEast.us" site_id="59036">TeenNick</channel>
+    <channel lang="en" xmltv_id="TeenNickUSEast.us" site_id="59036">TeenNick</channel>
     <channel lang="en" xmltv_id="TelevisionDominicana.us" site_id="14996">Televisión Dominicana</channel>
     <channel lang="en" xmltv_id="TeleXitos.us" site_id="74299">TeleXitos</channel>
     <channel lang="en" xmltv_id="TennisChannel.us" site_id="33395">Tennis Channel</channel>
diff --git a/sites/virginmedia.com/virginmedia.com_uk.channels.xml b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
index 46e0ddb9..c01cc13c 100644
--- a/sites/virginmedia.com/virginmedia.com_uk.channels.xml
+++ b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
@@ -122,9 +122,9 @@
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="1587">NDTV 24x7</channel>
     <channel lang="en" xmltv_id="NDTVGoodTimes.in" site_id="1676">NDTV Good Times</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="1731">NHK World Japan</channel>
-    <channel lang="en" xmltv_id="NickelodeonEurope.us" site_id="1734">Nickelodeon Europe</channel>
-    <channel lang="en" xmltv_id="NickJrUK.us" site_id="397">Nick Jr UK</channel>
-    <channel lang="en" xmltv_id="NickToonsUK.us" site_id="1399">NickToons UK</channel>
+    <channel lang="en" xmltv_id="NickelodeonUK.uk" site_id="1734">Nickelodeon</channel>
+    <channel lang="en" xmltv_id="NickJrUK.uk" site_id="397">Nick Jr UK</channel>
+    <channel lang="en" xmltv_id="NicktoonsUK.uk" site_id="1399">NickToons UK</channel>
     <channel lang="en" xmltv_id="Now70s.uk" site_id="2031">Now 70&apos;s</channel>
     <channel lang="en" xmltv_id="Now80s.uk" site_id="1956">Now 80&apos;s</channel>
     <channel lang="en" xmltv_id="Now90s.uk" site_id="2030">Now 90&apos;s</channel>
diff --git a/sites/vivacom.bg/vivacom.bg_bg.channels.xml b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
index b3cca2e5..541acdaf 100644
--- a/sites/vivacom.bg/vivacom.bg_bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
@@ -112,8 +112,8 @@
     <channel lang="en" xmltv_id="MTVLive.us" site_id="14#MTV live">MTV Live</channel>
     <channel lang="bg" xmltv_id="NationalGeographicBulgaria.us" site_id="15#National Geographic HD">National Geographic Bulgaria</channel>
     <channel lang="bg" xmltv_id="NationalGeographicWildEurope.us" site_id="15#Nat Geo Wild HD">National Geographic Wild Europe</channel>
-    <channel lang="bg" xmltv_id="NickelodeonEurope.us" site_id="8#Nickelodeon">Nickelodeon Europe</channel>
-    <channel lang="bg" xmltv_id="NickJrCentralEasternEurope.us" site_id="8#Nick Junior">Nick Jr Central &amp; Eastern Europe</channel>
+    <channel lang="bg" xmltv_id="NickelodeonBulgaria.bg" site_id="8#Nickelodeon">Nickelodeon</channel>
+    <channel lang="bg" xmltv_id="NickJrBulgaria.bg" site_id="8#Nick Junior">Nick Jr</channel>
     <channel lang="bg" xmltv_id="NovaNews.bg" site_id="1#Nova News HD">Nova News</channel>
     <channel lang="bg" xmltv_id="NovaSport.bg" site_id="18#Nova Sport">Nova Sport</channel>
     <channel lang="bg" xmltv_id="NovaTV.bg" site_id="1#Nova TV">Nova TV</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
index 9c4c6c95..8f17a5e7 100644
--- a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
@@ -76,10 +76,10 @@
     <channel lang="nl" xmltv_id="NationalGeographicNederland.us" site_id="NL_000018_019221">National Geographic Nederland</channel>
     <channel lang="nl" xmltv_id="NationalGeographicWildEurope.us" site_id="NL_000077_019706">National Geographic Wild Europe</channel>
     <channel lang="nl" xmltv_id="Net5.nl" site_id="NL_000009_019024">Net 5</channel>
-    <channel lang="nl" xmltv_id="NickJrCentralEasternEurope.us" site_id="NL_000087_019303">Nick Jr Central &amp; Eastern Europe</channel>
-    <channel lang="nl" xmltv_id="NickMusic.us" site_id="NL_000085_019494">NickMusic</channel>
-    <channel lang="nl" xmltv_id="NickToonsUK.us" site_id="NL_000084_019301">NickToons UK</channel>
-    <channel lang="nl" xmltv_id="NickelodeonNederlandBelgie.us" site_id="NL_000029_019046">Nickelodeon Nederland &amp; België</channel>
+    <channel lang="nl" xmltv_id="NickJrNetherlands.nl" site_id="NL_000087_019303">Nick Jr</channel>
+    <channel lang="nl" xmltv_id="NickMusicNetherlands.nl" site_id="NL_000085_019494">NickMusic</channel>
+    <channel lang="nl" xmltv_id="NicktoonsNetherlands.nl" site_id="NL_000084_019301">NickToons</channel>
+    <channel lang="nl" xmltv_id="NickelodeonNetherlands.nl" site_id="NL_000029_019046">Nickelodeon</channel>
     <channel lang="nl" xmltv_id="ONS.nl" site_id="NL_000030_019152">ONS</channel>
     <channel lang="nl" xmltv_id="OmroepBrabantTV.nl" site_id="NL_000147_019593">Omroep Brabant TV</channel>
     <channel lang="nl" xmltv_id="OmroepFlevolandTV.nl" site_id="NL_000141_019209">Omroep Flevoland TV</channel>