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 ed720380..efa7cbfd 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -122,7 +122,7 @@
     <channel lang="ms" xmltv_id="ShowcaseMovies.uk" site_id="454">Showcase Movies</channel>
     <channel lang="ms" xmltv_id="SkyNewsUK.uk" site_id="155">Sky News UK</channel>
     <channel lang="ms" xmltv_id="SpoTV.kr" site_id="456">SPOTV</channel>
-    <channel lang="ms" xmltv_id="StarVijayMalaysia.hk" site_id="357">Star Vijay Malaysia</channel>
+    <channel lang="ms" xmltv_id="StarVijay.in" site_id="357">Star Vijay Malaysia</channel>
     <channel lang="ms" xmltv_id="SunMusic.in" site_id="417">Sun Music</channel>
     <channel lang="ms" xmltv_id="SunTVMalaysia.in" site_id="358">Sun TV Malaysia</channel>
     <channel lang="ms" xmltv_id="TLCSoutheastAsia.us" site_id="338">TLC Southeast Asia</channel>
diff --git a/sites/bt.com/bt.com_uk.channels.xml b/sites/bt.com/bt.com_uk.channels.xml
index 1ae850fc..2a416ee4 100644
--- a/sites/bt.com/bt.com_uk.channels.xml
+++ b/sites/bt.com/bt.com_uk.channels.xml
@@ -64,7 +64,7 @@
     <channel lang="en" xmltv_id="Channel5Plus1.uk" site_id="hswf">Channel 5 +1</channel>
     <channel lang="en" xmltv_id="CITV.uk" site_id="hsyc">CITV</channel>
     <channel lang="en" xmltv_id="ClublandTV.uk" site_id="hs8s">Clubland TV</channel>
-    <channel lang="en" xmltv_id="ComedyCentralUK.us" site_id="hsrs">Comedy Central UK</channel>
+    <channel lang="en" xmltv_id="ComedyCentralUK.uk" site_id="hsrs">Comedy Central UK</channel>
     <channel lang="en" xmltv_id="CraftStoreTV.uk" site_id="hsxg">Craft Store TV</channel>
     <channel lang="en" xmltv_id="CreateandCraft.uk" site_id="hsxr">Create and Craft</channel>
     <channel lang="en" xmltv_id="Davejavu.uk" site_id="hsxb">Dave ja vu</channel>
diff --git a/sites/canalplus.com/canalplus.com_fr.channels.xml b/sites/canalplus.com/canalplus.com_fr.channels.xml
index a202ff6e..c5009165 100644
--- a/sites/canalplus.com/canalplus.com_fr.channels.xml
+++ b/sites/canalplus.com/canalplus.com_fr.channels.xml
@@ -62,7 +62,7 @@
     <channel lang="fr" xmltv_id="CNNInternationalEurope.us" site_id="30">CNN INT.</channel>
     <channel lang="fr" xmltv_id="ColmaxTV.fr" site_id="643">COLMAX TV</channel>
     <channel lang="fr" xmltv_id="ComediePlus.fr" site_id="534">COMEDIE+</channel>
-    <channel lang="fr" xmltv_id="ComedyCentralFrance.us" site_id="806">COMEDY CENTRAL</channel>
+    <channel lang="fr" xmltv_id="ComedyCentralFrance.fr" site_id="806">COMEDY CENTRAL</channel>
     <channel lang="fr" xmltv_id="CStar.fr" site_id="513">CSTAR</channel>
     <channel lang="fr" xmltv_id="CStarHitsFrance.fr" site_id="723">CSTAR HITS FRANCE</channel>
     <channel lang="fr" xmltv_id="DasErste.de" site_id="781">ARD DAS ERSTE</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 4216907d..c5114abd 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
@@ -57,7 +57,7 @@
     <channel lang="fr" xmltv_id="CNews.fr" site_id="226">C News</channel>
     <channel lang="fr" xmltv_id="CNNInternationalEurope.us" site_id="53">CNN International Europe</channel>
     <channel lang="fr" xmltv_id="ComediePlus.fr" site_id="54">Comédie +</channel>
-    <channel lang="fr" xmltv_id="ComedyCentralFrance.us" site_id="2752">Comedy Central France</channel>
+    <channel lang="fr" xmltv_id="ComedyCentralFrance.fr" site_id="2752">Comedy Central France</channel>
     <channel lang="fr" xmltv_id="CrimeDistrict.fr" site_id="2037">Crime District</channel>
     <channel lang="fr" xmltv_id="CStar.fr" site_id="458">C Star</channel>
     <channel lang="fr" xmltv_id="DasErste.de" site_id="13">Das Erste</channel>
diff --git a/sites/delta.nl/delta.nl_nl.channels.xml b/sites/delta.nl/delta.nl_nl.channels.xml
index f12402ea..532eb4db 100644
--- a/sites/delta.nl/delta.nl_nl.channels.xml
+++ b/sites/delta.nl/delta.nl_nl.channels.xml
@@ -35,8 +35,8 @@
     <channel lang="nl" xmltv_id="CentraalTV.nl" site_id="3172">Centraal TV</channel>
     <channel lang="nl" xmltv_id="CGTN.cn" site_id="3125">CGTN</channel>
     <channel lang="nl" xmltv_id="CNNInternationalEurope.us" site_id="44">CNN International Europe</channel>
-    <channel lang="nl" xmltv_id="ComedyCentralExtraUK.us" site_id="79">Comedy Central Extra UK</channel>
-    <channel lang="nl" xmltv_id="ComedyCentralNederland.us" site_id="33">Comedy Central Nederland</channel>
+    <channel lang="nl" xmltv_id="ComedyCentralExtra.uk" site_id="79">Comedy Central Extra UK</channel>
+    <channel lang="nl" xmltv_id="ComedyCentralNederlands.nl" site_id="33">Comedy Central Nederland</channel>
     <channel lang="nl" xmltv_id="CrimePlusInvestigationUK.us" site_id="3007">Crime + Investigation UK</channel>
     <channel lang="nl" xmltv_id="DasErste.de" site_id="58">Das Erste</channel>
     <channel lang="nl" xmltv_id="DeltaTV.nl" site_id="3055">Delta TV</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index d313acdd..67c5f461 100644
--- a/sites/directv.com/directv.com_us.channels.xml
+++ b/sites/directv.com/directv.com_us.channels.xml
@@ -65,7 +65,7 @@
     <channel lang="en" xmltv_id="CNBCUS.us" site_id="355">CNBC US</channel>
     <channel lang="en" xmltv_id="CNBCWorld.us" site_id="357">CNBC World</channel>
     <channel lang="en" xmltv_id="CNNenEspanol.us" site_id="419">CNN en Español</channel>
-    <channel lang="en" xmltv_id="CNNUS.us" site_id="202">CNN USA</channel>
+    <channel lang="en" xmltv_id="CNN.us" site_id="202">CNN USA</channel>
     <channel lang="en" xmltv_id="ComedyCentralEast.us" site_id="249">Comedy Central East</channel>
     <channel lang="en" xmltv_id="ComedyTV.us" site_id="382">Comedy TV</channel>
     <channel lang="en" xmltv_id="CookingChannel.us" site_id="232">Cooking Channel</channel>
diff --git a/sites/dishtv.in/dishtv.in_in.channels.xml b/sites/dishtv.in/dishtv.in_in.channels.xml
index dc63a262..fe5604dd 100644
--- a/sites/dishtv.in/dishtv.in_in.channels.xml
+++ b/sites/dishtv.in/dishtv.in_in.channels.xml
@@ -58,7 +58,7 @@
     <channel lang="en" xmltv_id="ColorsMarathi.in" site_id="10000000000460000">Colors Marathi</channel>
     <channel lang="en" xmltv_id="ColorsOdia.in" site_id="10000000000430000">Colors Odia</channel>
     <channel lang="en" xmltv_id="ColorsRishteyAsia.in" site_id="10000000018500000">Colors Rishtey Asia</channel>
-    <channel lang="en" xmltv_id="ComedyCentralIndia.us" site_id="10000000034590000">Comedy Central India</channel>
+    <channel lang="en" xmltv_id="ComedyCentralIndia.in" site_id="10000000034590000">Comedy Central India</channel>
     <channel lang="en" xmltv_id="CTVNAKDPlus.in" site_id="10000000015980000">CTVN AKD Plus</channel>
     <channel lang="en" xmltv_id="DangalTV.in" site_id="10000000007680000">Dangal TV</channel>
     <channel lang="en" xmltv_id="DDArunPrabha.in" site_id="10000000051550000">DD Arun Prabha</channel>
@@ -120,7 +120,7 @@
     <channel lang="en" xmltv_id="Filamchi.in" site_id="10000000073830000">Filamchi</channel>
     <channel lang="en" xmltv_id="flix.in" site_id="10000000059360000">&amp; flix</channel>
     <channel lang="en" xmltv_id="FlowersTV.in" site_id="10000000028570000">Flowers TV</channel>
-    <channel lang="en" xmltv_id="FoxLifeIndia.us" site_id="10000000013350000">Fox Life India</channel>
+    <channel lang="en" xmltv_id="FoxLifeIndia.in" site_id="10000000013350000">Fox Life India</channel>
     <channel lang="en" xmltv_id="GeminiTV.in" site_id="10000000000580000">Gemini TV</channel>
     <channel lang="en" xmltv_id="Gubbare.in" site_id="10000000075990144">Gubbare</channel>
     <channel lang="en" xmltv_id="Gyandarshan.in" site_id="10000000003080000">Gyandarshan</channel>
@@ -164,7 +164,7 @@
     <channel lang="en" xmltv_id="MTVIndia.us" site_id="10000000000480000">MTV India</channel>
     <channel lang="en" xmltv_id="NaaptolTamil.in" site_id="10000000025590000">Naaptol Tamil</channel>
     <channel lang="en" xmltv_id="NandighoshaTV.in" site_id="10000000072550000">Nandighosha TV</channel>
-    <channel lang="en" xmltv_id="NationalGeographicIndia.us" site_id="10000000005780000">National Geographic India</channel>
+    <channel lang="en" xmltv_id="NationalGeographicIndia.in" site_id="10000000005780000">National Geographic India</channel>
     <channel lang="en" xmltv_id="NationalGeographicWildAsia.us" site_id="10000000013430000">National Geographic Wild Asia</channel>
     <channel lang="en" xmltv_id="NaxatraNews.in" site_id="10000000016110000">Naxatra News</channel>
     <channel lang="en" xmltv_id="NDTV24x7.in" site_id="10000000000500000">NDTV 24x7</channel>
@@ -247,28 +247,28 @@
     <channel lang="en" xmltv_id="SonyTen3.in" site_id="10000000053080000">Sony Ten 3</channel>
     <channel lang="en" xmltv_id="SonyWah.in" site_id="10000000043750000">Sony Wah</channel>
     <channel lang="en" xmltv_id="SonyYay.in" site_id="10000000051840000">Sony Yay!</channel>
-    <channel lang="en" xmltv_id="StarBharatIndia.hk" site_id="10000000053360000">Star Bharat India</channel>
-    <channel lang="en" xmltv_id="StarGold2.hk" site_id="10000000009260000">Star Gold 2</channel>
-    <channel lang="en" xmltv_id="StarGoldHDIndia.hk" site_id="10000000006960000">Star Gold HD India</channel>
-    <channel lang="en" xmltv_id="StarGoldSelect.hk" site_id="10000000050920000">Star Gold Select</channel>
+    <channel lang="en" xmltv_id="StarBharat.in" site_id="10000000053360000">Star Bharat India</channel>
+    <channel lang="en" xmltv_id="StarGold2.in" site_id="10000000009260000">Star Gold 2</channel>
+    <channel lang="en" xmltv_id="StarGoldHD.in" site_id="10000000006960000">Star Gold HD India</channel>
+    <channel lang="en" xmltv_id="StarGoldSelect.in" site_id="10000000050920000">Star Gold Select</channel>
     <channel lang="en" xmltv_id="StarJalsha.in" site_id="10000000041830000">Star Jalsha</channel>
     <channel lang="en" xmltv_id="StarMaa.in" site_id="10000000001220000">Star Maa</channel>
     <channel lang="en" xmltv_id="StarMaaMovies.in" site_id="10000000006690000">Star Maa Movies</channel>
-    <channel lang="en" xmltv_id="StarMoviesHDIndia.hk" site_id="10000000006970000">Star Movies HD India</channel>
-    <channel lang="en" xmltv_id="StarMoviesSelect.hk" site_id="10000000034570000">Star Movies Select</channel>
-    <channel lang="en" xmltv_id="StarPlusHDIndia.hk" site_id="10000000006010000">Star Plus HD India</channel>
+    <channel lang="en" xmltv_id="StarMoviesHDIndia.in" site_id="10000000006970000">Star Movies HD India</channel>
+    <channel lang="en" xmltv_id="StarMoviesSelectHD.in" site_id="10000000034570000">Star Movies Select</channel>
+    <channel lang="en" xmltv_id="StarPlusHD.in" site_id="10000000006010000">Star Plus HD India</channel>
     <channel lang="en" xmltv_id="StarPravah.in" site_id="10000000042610000">Star Pravah</channel>
-    <channel lang="en" xmltv_id="StarSports1.hk" site_id="10000000006760000">Star Sports 1</channel>
-    <channel lang="en" xmltv_id="StarSports1Hindi.hk" site_id="10000000027750000">Star Sports 1 Hindi</channel>
-    <channel lang="en" xmltv_id="StarSports2.hk" site_id="10000000005870000">Star Sports 2</channel>
-    <channel lang="en" xmltv_id="StarSports3.hk" site_id="10000000061080000">Star Sports 3</channel>
-    <channel lang="en" xmltv_id="StarSportsFirst.hk" site_id="10000000053100000">Star Sports First</channel>
-    <channel lang="en" xmltv_id="StarSportsSelectHD1.hk" site_id="10000000047500000">Star Sports Select HD1</channel>
-    <channel lang="en" xmltv_id="StarSportsSelectHD2.hk" site_id="10000000047510000">Star Sports Select HD2</channel>
-    <channel lang="en" xmltv_id="StarUtsav.hk" site_id="10000000000130000">Star Utsav</channel>
-    <channel lang="en" xmltv_id="StarUtsavMovies.hk" site_id="10000000043030000">Star Utsav Movies</channel>
-    <channel lang="en" xmltv_id="StarWorldHDIndia.hk" site_id="10000000006980000">Star World HD India</channel>
-    <channel lang="en" xmltv_id="StarWorldPremiereHD.hk" site_id="10000000017700000">Star World Premiere HD</channel>
+    <channel lang="en" xmltv_id="StarSports1.in" site_id="10000000006760000">Star Sports 1</channel>
+    <channel lang="en" xmltv_id="StarSports1Hindi.in" site_id="10000000027750000">Star Sports 1 Hindi</channel>
+    <channel lang="en" xmltv_id="StarSports2.in" site_id="10000000005870000">Star Sports 2</channel>
+    <channel lang="en" xmltv_id="StarSports3.in" site_id="10000000061080000">Star Sports 3</channel>
+    <channel lang="en" xmltv_id="StarSportsFirst.in" site_id="10000000053100000">Star Sports First</channel>
+    <channel lang="en" xmltv_id="StarSportsSelect1HD.in" site_id="10000000047500000">Star Sports Select HD1</channel>
+    <channel lang="en" xmltv_id="StarSportsSelect2HD.in" site_id="10000000047510000">Star Sports Select HD2</channel>
+    <channel lang="en" xmltv_id="StarUtsav.in" site_id="10000000000130000">Star Utsav</channel>
+    <channel lang="en" xmltv_id="StarUtsavMovies.in" site_id="10000000043030000">Star Utsav Movies</channel>
+    <channel lang="en" xmltv_id="StarWorldHDIndia.in" site_id="10000000006980000">Star World HD India</channel>
+    <channel lang="en" xmltv_id="StarWorldPremiereHD.in" site_id="10000000017700000">Star World Premiere HD</channel>
     <channel lang="en" xmltv_id="SudarshanNews.in" site_id="10000000003290000">Sudarshan News</channel>
     <channel lang="en" xmltv_id="SunBangla.in" site_id="10000000064090000">Sun Bangla</channel>
     <channel lang="en" xmltv_id="SunTV.in" site_id="10000000000570000">Sun TV</channel>
diff --git a/sites/gatotv.com/gatotv.com_bo.channels.xml b/sites/gatotv.com/gatotv.com_bo.channels.xml
index 60ceb646..2e655ff6 100644
--- a/sites/gatotv.com/gatotv.com_bo.channels.xml
+++ b/sites/gatotv.com/gatotv.com_bo.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_bolivia">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_bolivia">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_bolivia">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSur.us" site_id="comedy_central_bolivia">Comedy Central Latinoamérica Sur</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSouth.us" site_id="comedy_central_bolivia">Comedy Central Latinoamérica Sur</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_bolivia">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_bolivia">Discovery Kids América Latina</channel>
     <channel lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="disney_channel_bolivia">Disney Channel Sur</channel>
diff --git a/sites/gatotv.com/gatotv.com_co.channels.xml b/sites/gatotv.com/gatotv.com_co.channels.xml
index 63cfaf39..fb87cf0b 100644
--- a/sites/gatotv.com/gatotv.com_co.channels.xml
+++ b/sites/gatotv.com/gatotv.com_co.channels.xml
@@ -16,7 +16,7 @@
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_colombia">Cinemax Latinoamérica</channel>
     <channel lang="es" xmltv_id="CityTV.co" site_id="city_tv">City TV</channel>
     <channel lang="es" xmltv_id="ClaromusicaTV.co" site_id="claro_musica">Claro música TV</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_colombia">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_colombia">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_colombia">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_colombia">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_colombia">Discovery Kids América Latina</channel>
diff --git a/sites/gatotv.com/gatotv.com_cr.channels.xml b/sites/gatotv.com/gatotv.com_cr.channels.xml
index 9cd9ca9b..57dc8c75 100644
--- a/sites/gatotv.com/gatotv.com_cr.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cr.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_costa_rica">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_costa_rica">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_costa_rica">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_costa_rica">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_costa_rica">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_costa_rica">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_costa_rica">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_costa_rica">Discovery Kids América Latina</channel>
diff --git a/sites/gatotv.com/gatotv.com_do.channels.xml b/sites/gatotv.com/gatotv.com_do.channels.xml
index a2229c1a..c185da9e 100644
--- a/sites/gatotv.com/gatotv.com_do.channels.xml
+++ b/sites/gatotv.com/gatotv.com_do.channels.xml
@@ -13,7 +13,7 @@
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_republica_dominicana">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_republica_dominicana">Cinemax Latinoamérica</channel>
     <channel lang="es" xmltv_id="ColorVision9.do" site_id="9_republica_dominicana">Color Visión 9</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_republica_dominicana">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_republica_dominicana">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="Digital15.do" site_id="15_republica_dominicana">Digital 15</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_republica_dominicana">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_republica_dominicana">Discovery Home &amp; Health Latinoamérica</channel>
diff --git a/sites/gatotv.com/gatotv.com_ec.channels.xml b/sites/gatotv.com/gatotv.com_ec.channels.xml
index 10786f13..91057d28 100644
--- a/sites/gatotv.com/gatotv.com_ec.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ec.channels.xml
@@ -10,7 +10,7 @@
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_ecuador">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_ecuador">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_ecuador">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_ecuador">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_ecuador">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_ecuador">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_ecuador">Discovery Kids América Latina</channel>
     <channel lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="disney_channel_ecuador">Disney Channel Centro</channel>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index 9ace10e2..cf4dbe65 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="es" xmltv_id="CanalPandaSpain.pt" site_id="panda_espana">Canal Panda España</channel>
     <channel lang="es" xmltv_id="CanalSurAndalucia.es" site_id="sur_andalucia">Canal Sur Andalucía</channel>
     <channel lang="es" xmltv_id="ClanTVE.es" site_id="clan_tve">Clan TVE</channel>
-    <channel lang="es" xmltv_id="ComedyCentralSpain.us" site_id="comedy_central_espana">Comedy Central España</channel>
+    <channel lang="es" xmltv_id="ComedyCentralSpain.es" site_id="comedy_central_espana">Comedy Central España</channel>
     <channel lang="es" xmltv_id="CosmopolitanTV.es" site_id="cosmopolitan_espana">Cosmopolitan TV España</channel>
     <channel lang="es" xmltv_id="Cuatro.es" site_id="cuatro_de_espana">Cuatro</channel>
     <channel lang="es" xmltv_id="Decasa.es" site_id="decasa">Decasa</channel>
diff --git a/sites/gatotv.com/gatotv.com_mx.channels.xml b/sites/gatotv.com/gatotv.com_mx.channels.xml
index d3396721..38510c82 100644
--- a/sites/gatotv.com/gatotv.com_mx.channels.xml
+++ b/sites/gatotv.com/gatotv.com_mx.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="es" xmltv_id="CinemaDinamita.mx" site_id="cinema_dinamita">Cinema Dinamita</channel>
     <channel lang="es" xmltv_id="CinemaPlatino.mx" site_id="cinema_platino">Cinema Platino</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_mexico">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_mexico">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_mexico">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DePelicula.mx" site_id="de_pelicula">De Película</channel>
     <channel lang="es" xmltv_id="DePeliculaClasico.mx" site_id="de_pelicula_clasico">De Película Clásico</channel>
     <channel lang="es" xmltv_id="DePeliculaMultiplex.mx" site_id="de_pelicula_m">De Película Multiplex</channel>
diff --git a/sites/gatotv.com/gatotv.com_ni.channels.xml b/sites/gatotv.com/gatotv.com_ni.channels.xml
index b632a3f3..29c4e7f1 100644
--- a/sites/gatotv.com/gatotv.com_ni.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ni.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="es" xmltv_id="Canal2.ni" site_id="2_de_nicaragua_televicentro">Canal 2</channel>
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_nicaragua">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_nicaragua">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_nicaragua">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_nicaragua">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_nicaragua">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_nicaragua">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_nicaragua">Discovery Kids América Latina</channel>
diff --git a/sites/gatotv.com/gatotv.com_pa.channels.xml b/sites/gatotv.com/gatotv.com_pa.channels.xml
index 9e5906d2..f9a62195 100644
--- a/sites/gatotv.com/gatotv.com_pa.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pa.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_panama">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_panama">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_panama">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_panama">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_panama">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_panama">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_panama">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_panama">Discovery Kids América Latina</channel>
diff --git a/sites/gatotv.com/gatotv.com_pe.channels.xml b/sites/gatotv.com/gatotv.com_pe.channels.xml
index 8bd9db2f..85fdeb00 100644
--- a/sites/gatotv.com/gatotv.com_pe.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pe.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_peru">Cartoon Network Latin America</channel>
     <channel lang="es" xmltv_id="CinecanalWest.us" site_id="cinecanal_peru">Cinecanal Oeste</channel>
     <channel lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_peru">Cinemax Latinoamérica</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_peru">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_peru">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_peru">Discovery Kids América Latina</channel>
     <channel lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="disney_channel_peru">Disney Channel Centro</channel>
     <channel lang="es" xmltv_id="ELatinAmerica.us" site_id="e_entertainment_television_peru">E! Latinoamérica</channel>
diff --git a/sites/gatotv.com/gatotv.com_sv.channels.xml b/sites/gatotv.com/gatotv.com_sv.channels.xml
index 922f3de1..015be6f7 100644
--- a/sites/gatotv.com/gatotv.com_sv.channels.xml
+++ b/sites/gatotv.com/gatotv.com_sv.channels.xml
@@ -11,7 +11,7 @@
     <channel lang="es" xmltv_id="Canal6.sv" site_id="6_de_el_salvador">Canal 6</channel>
     <channel lang="es" xmltv_id="Canal12.sv" site_id="12_de_el_salvador">Canal 12</channel>
     <channel lang="es" xmltv_id="CartoonNetworkLatinAmerica.us" site_id="cartoon_network_el_salvador">Cartoon Network Latin America</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="comedy_central_el_salvador">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="comedy_central_el_salvador">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="discovery_channel_el_salvador">Discovery Channel Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryHomeHealthLatinAmerica.us" site_id="discovery_home_and_health_el_salvador">Discovery Home &amp; Health Latinoamérica</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsAmericaLatina.us" site_id="discovery_kids_el_salvador">Discovery Kids América Latina</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 d3107c8f..b5261c62 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -20,8 +20,8 @@
     <channel lang="it" xmltv_id="ClassicaHD.de" site_id="DTH#8007">Classica HD</channel>
     <channel lang="it" xmltv_id="CNBCEurope.us" site_id="DTH#10713">CNBC Europe</channel>
     <channel lang="it" xmltv_id="CNNInternationalEurope.us" site_id="DTH#312">CNN International Europe</channel>
-    <channel lang="it" xmltv_id="ComedyCentralItalia.us" site_id="DTH#318">Comedy Central Italia</channel>
-    <channel lang="it" xmltv_id="ComedyCentralItaliaPlus1.us" site_id="DTH#8353">Comedy Central Italia +1</channel>
+    <channel lang="it" xmltv_id="ComedyCentralItalia.it" site_id="DTH#318">Comedy Central Italia</channel>
+    <channel lang="it" xmltv_id="ComedyCentralItaliaPlus1.it" site_id="DTH#8353">Comedy Central Italia +1</channel>
     <channel lang="it" xmltv_id="CrimePlusInvestigationNetworkItalia.us" site_id="DTH#8336">Crime + Investigation Network Italia</channel>
     <channel lang="it" xmltv_id="DeAJunior.it" site_id="DTH#7427">DeA Junior</channel>
     <channel lang="it" xmltv_id="DeAKids.it" site_id="DTH#460">DeA Kids</channel>
diff --git a/sites/hd-plus.de/hd-plus.de_de.channels.xml b/sites/hd-plus.de/hd-plus.de_de.channels.xml
index a4d7f8ff..cc397e98 100644
--- a/sites/hd-plus.de/hd-plus.de_de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de_de.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="de" xmltv_id="BoomerangGermany.us" site_id="boomerang">Boomerang Deutschland</channel>
     <channel lang="de" xmltv_id="CartoonNetworkGermany.us" site_id="cartoon-network">Cartoon Network Deutschland</channel>
     <channel lang="de" xmltv_id="Channel21.de" site_id="channel-21">Channel 21</channel>
-    <channel lang="de" xmltv_id="ComedyCentralGermany.us" site_id="comedy-central">Comedy Central Deutschland</channel>
+    <channel lang="de" xmltv_id="ComedyCentralGermany.de" site_id="comedy-central">Comedy Central Deutschland</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="das-erste-hd">Das Erste</channel>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="deluxe-music-hd">Deluxe Music</channel>
     <channel lang="de" xmltv_id="DeutschesMusikFernsehen.de" site_id="deutsches-musik-fernsehen">Deutsches Musik Fernsehen</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index 9af6470b..85a9b08d 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -31,7 +31,7 @@
     <channel lang="de" xmltv_id="CMCTV.hr" site_id="SV_09999_59103">CMC</channel>
     <channel lang="de" xmltv_id="CNBCEurope.us" site_id="CNBC_1">CNBC</channel>
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN</channel>
-    <channel lang="de" xmltv_id="ComedyCentralGermany.us" site_id="SV_09999_24101">COMEDY CENTRAL</channel>
+    <channel lang="de" xmltv_id="ComedyCentralGermany.de" site_id="SV_09999_24101">COMEDY CENTRAL</channel>
     <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="SV_09999_25104">Crime + Investigation</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="Das_Erste">Das Erste</channel>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="DELUXE_MUSIC">DELUXE MUSIC</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 5845ef8d..3bc3e912 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
@@ -70,8 +70,8 @@
     <channel lang="cz" xmltv_id="CNLEvropa.kz" site_id="CNL">CNL Evropa</channel>
     <channel lang="cz" xmltv_id="CNNInternationalEurope.us" site_id="CNN+International">CNN International Europe</channel>
     <channel lang="cz" xmltv_id="CNNPrimaNews.cz" site_id="CNN+Prima+News">CNN Prima News</channel>
-    <channel lang="cz" xmltv_id="ComedyCentralFamilyHungary.us" site_id="Comedy+Central+Family+%28hu%29">Comedy Central Family Hungary</channel>
-    <channel lang="cz" xmltv_id="ComedyCentralHungary.us" site_id="Comedy+Central+%28hu%29">Comedy Central Hungary</channel>
+    <channel lang="cz" xmltv_id="ComedyCentralFamilyHungary.hu" site_id="Comedy+Central+Family+%28hu%29">Comedy Central Family Hungary</channel>
+    <channel lang="cz" xmltv_id="ComedyCentralHungary.hu" site_id="Comedy+Central+%28hu%29">Comedy Central Hungary</channel>
     <channel lang="cz" xmltv_id="CoolTV.hu" site_id="Cool+TV">Cool TV</channel>
     <channel lang="cz" xmltv_id="CredoTV.ro" site_id="Credo">Credo TV</channel>
     <channel lang="cz" xmltv_id="CrimePlusInvestigationUK.us" site_id="Crime+and+Investigation+UK">Crime + Investigation UK</channel>
diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index 0cae3424..6d19718c 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN</channel>
     <channel lang="de" xmltv_id="CartoonNetworkGermany.us" site_id="Cartoon_Network_HD">Cartoon Network</channel>
     <channel lang="de" xmltv_id="ClubMTV.us" site_id="MTV_Dance">Club MTV</channel>
-    <channel lang="de" xmltv_id="ComedyCentralGermany.us" site_id="Comedy_Central_VIVA_HD">COMEDY CENTRAL</channel>
+    <channel lang="de" xmltv_id="ComedyCentralGermany.de" site_id="Comedy_Central_VIVA_HD">COMEDY CENTRAL</channel>
     <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="A_E_HD">Crime + Investigation</channel>
     <channel lang="de" xmltv_id="DMAXAustria.us" site_id="DMAX_HD">DMAX Austria</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="Das_Erste_HD">Das Erste</channel>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index f032598c..e40edfbe 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -35,8 +35,8 @@
     <channel lang="de" xmltv_id="ChemnitzFernsehen.de" site_id="2612">Chemnitz Fernsehen</channel>
     <channel lang="de" xmltv_id="ClassicaHD.de" site_id="118">Classica (Sky)</channel>
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="399">CNN International</channel>
-    <channel lang="de" xmltv_id="ComedyCentralGermany.us" site_id="50">Comedy Central</channel>
-    <channel lang="de" xmltv_id="ComedyCentralDeutschlandPlus1.us" site_id="54">Nick/Comedy Central+1</channel>
+    <channel lang="de" xmltv_id="ComedyCentralGermany.de" site_id="50">Comedy Central</channel>
+    <channel lang="de" xmltv_id="ComedyCentralGermanyPlus1.de" site_id="54">Nick/Comedy Central+1</channel>
     <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="106">Crime+Investigation</channel>
     <channel lang="de" xmltv_id="DabeiTV.de" site_id="4375">#dabeiTV</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="373">Das Erste</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index eeaacd24..8209601d 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -38,7 +38,7 @@
     <channel lang="es" xmltv_id="CNNChile.cl" site_id="ar#cnn-chile">CNN Chile</channel>
     <channel lang="es" xmltv_id="CNNenEspanol.us" site_id="ar#cnn-en-espanol">CNN en Español</channel>
     <channel lang="es" xmltv_id="CNNInternationalLatinAmerica.us" site_id="ar#cnn">CNN International Latin America</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSur.us" site_id="ar#comedy-central">Comedy Central Latinoamérica Sur</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSouth.us" site_id="ar#comedy-central">Comedy Central Latinoamérica Sur</channel>
     <channel lang="es" xmltv_id="ConexionEducativa.ar" site_id="ar#conexion-educativa">Conexión Educativa</channel>
     <channel lang="es" xmltv_id="ConstruirTV.ar" site_id="ar#construir">Construir TV</channel>
     <channel lang="es" xmltv_id="CronicaTV.ar" site_id="ar#cronica">Crónica TV</channel>
diff --git a/sites/mi.tv/mi.tv_br.channels.xml b/sites/mi.tv/mi.tv_br.channels.xml
index a72c9b30..8c251252 100644
--- a/sites/mi.tv/mi.tv_br.channels.xml
+++ b/sites/mi.tv/mi.tv_br.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="pt" xmltv_id="AnimalPlanetBrasil.us" site_id="br#animal-planet">Animal Planet Brasil</channel>
     <channel lang="pt" xmltv_id="Arte1.br" site_id="br#arte-1">Arte 1</channel>
     <channel lang="pt" xmltv_id="AXNBrazil.us" site_id="br#axn">AXN Brazil</channel>
-    <channel lang="pt" xmltv_id="BabyTVBrasil.uk" site_id="br#baby-tv">Baby TV Brasil</channel>
+    <channel lang="pt" xmltv_id="BabyTVBrazil.br" site_id="br#baby-tv">Baby TV Brasil</channel>
     <channel lang="pt" xmltv_id="BandAmazonas.br" site_id="br#band-amazonas">Band Amazonas</channel>
     <channel lang="pt" xmltv_id="BandBahia.br" site_id="br#band-bahia">Band Bahia</channel>
     <channel lang="pt" xmltv_id="BandCuritiba.br" site_id="br#band-curitiba">Band Curitiba</channel>
@@ -34,7 +34,7 @@
     <channel lang="pt" xmltv_id="CinemaxBrasil.us" site_id="br#cinemax">Cinemax Brasil</channel>
     <channel lang="pt" xmltv_id="CNNBrasil.br" site_id="br#cnn-brasil">CNN Brasil</channel>
     <channel lang="pt" xmltv_id="CNNInternationalAsiaPacific.us" site_id="br#cnn-international-hd">CNN International Asia Pacific</channel>
-    <channel lang="pt" xmltv_id="ComedyCentralBrasil.us" site_id="br#comedy-central">Comedy Central Brasil</channel>
+    <channel lang="pt" xmltv_id="ComedyCentralBrazil.us" site_id="br#comedy-central">Comedy Central Brasil</channel>
     <channel lang="pt" xmltv_id="ConmebolTV1.br" site_id="br#conmebol-tv-1">Conmebol TV 1</channel>
     <channel lang="pt" xmltv_id="ConmebolTV2.br" site_id="br#conmebol-tv-2">Conmebol TV 2</channel>
     <channel lang="pt" xmltv_id="ConmebolTV3.br" site_id="br#conmebol-tv-3">Conmebol TV 3</channel>
diff --git a/sites/mi.tv/mi.tv_co.channels.xml b/sites/mi.tv/mi.tv_co.channels.xml
index 09269eb8..7d5a2cca 100644
--- a/sites/mi.tv/mi.tv_co.channels.xml
+++ b/sites/mi.tv/mi.tv_co.channels.xml
@@ -13,7 +13,7 @@
     <channel lang="es" xmltv_id="CanalTRO.co" site_id="co#tro">Canal TRO</channel>
     <channel lang="es" xmltv_id="CanalU.co" site_id="co#canal-u">Canal U</channel>
     <channel lang="es" xmltv_id="CaracolTV.co" site_id="co#caracol">Caracol TV</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorte.us" site_id="co#comedy-central-hd">Comedy Central Latinoamérica Norte</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaNorth.us" site_id="co#comedy-central-hd">Comedy Central Latinoamérica Norte</channel>
     <channel lang="es" xmltv_id="Cosmovision.co" site_id="co#cosmovision">Cosmovisión</channel>
     <channel lang="es" xmltv_id="Cristovision.co" site_id="co#cristo-vision">Cristovisión</channel>
     <channel lang="es" xmltv_id="DiscoveryKidsColombia.us" site_id="co#discovery-kids">Discovery Kids Colombia</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es_channels.xml b/sites/movistarplus.es/movistarplus.es_es_channels.xml
index c9928a8b..76c3cf6c 100644
--- a/sites/movistarplus.es/movistarplus.es_es_channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es_channels.xml
@@ -42,7 +42,7 @@
     <channel lang="es" xmltv_id="CNBCEurope.us" site_id="NBC">CNBC Europe</channel>
     <channel lang="es" xmltv_id="CNCWorldEnglish.cn" site_id="CNCWOR">CNC World English</channel>
     <channel lang="es" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN International Europe</channel>
-    <channel lang="es" xmltv_id="ComedyCentralSpain.us" site_id="PCM">Comedy Central España</channel>
+    <channel lang="es" xmltv_id="ComedyCentralSpain.es" site_id="PCM">Comedy Central España</channel>
     <channel lang="es" xmltv_id="CosmopolitanTV.es" site_id="COSMO">Cosmopolitan TV España</channel>
     <channel lang="es" xmltv_id="CrimenPlusInvestigacion.us" site_id="CYM">Crimen + Investigación</channel>
     <channel lang="es" xmltv_id="Cuatro.es" site_id="C4">Cuatro</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index 6a3bc66d..651d7c6c 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -23,8 +23,8 @@
     <channel lang="hu" xmltv_id="ClubMTV.us" site_id="CLUB_MTV">club MTV</channel>
     <channel lang="hu" xmltv_id="CNBCEurope.us" site_id="CNBC">CNBC</channel>
     <channel lang="hu" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN</channel>
-    <channel lang="hu" xmltv_id="ComedyCentralFamilyHungary.us" site_id="COMEDY_CENTRAL_FAMILY">Comedy Central Family</channel>
-    <channel lang="hu" xmltv_id="ComedyCentralHungary.us" site_id="COMEDY">Comedy Central (HD)</channel>
+    <channel lang="hu" xmltv_id="ComedyCentralFamilyHungary.hu" site_id="COMEDY_CENTRAL_FAMILY">Comedy Central Family</channel>
+    <channel lang="hu" xmltv_id="ComedyCentralHungary.hu" site_id="COMEDY">Comedy Central (HD)</channel>
     <channel lang="hu" xmltv_id="CoolTV.hu" site_id="COOL">Cool (HD)</channel>
     <channel lang="hu" xmltv_id="D1TV.hu" site_id="D1TV">D1 Televízió</channel>
     <channel lang="hu" xmltv_id="DaVinciHungary.de" site_id="DAVINCI">Da Vinci</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 7282d5f3..602328bc 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
@@ -112,10 +112,10 @@
     <channel lang="en" xmltv_id="SkyNewsUK.uk" site_id="323">Sky News UK</channel>
     <channel lang="en" xmltv_id="SonyMaxAsia.in" site_id="772">Sony Max Asia</channel>
     <channel lang="en" xmltv_id="SonySABAsia.in" site_id="774">Sony SAB TV Asia</channel>
-    <channel lang="en" xmltv_id="StarBharatIndia.hk" site_id="797">Star Bharat India</channel>
+    <channel lang="en" xmltv_id="StarBharat.in" site_id="797">Star Bharat India</channel>
     <channel lang="en" xmltv_id="StarChineseMoviesSouthEastAsia.hk" site_id="139">Star Chinese Movies South East Asia</channel>
-    <channel lang="en" xmltv_id="StarGold.hk" site_id="793">Star Gold</channel>
-    <channel lang="en" xmltv_id="StarPlusSoutheastAsia.hk" site_id="794">Star Plus Southeast Asia</channel>
+    <channel lang="en" xmltv_id="StarGold.in" site_id="793">Star Gold</channel>
+    <channel lang="en" xmltv_id="StarPlus.in" site_id="794">Star Plus Southeast Asia</channel>
     <channel lang="en" xmltv_id="TFCAsiaPacific.ph" site_id="725">TFC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="125">Thrill</channel>
     <channel lang="en" xmltv_id="TLCSoutheastAsia.us" site_id="213">TLC Southeast Asia</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index a8f4f240..198bcc49 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
@@ -112,10 +112,10 @@
     <channel lang="zh" xmltv_id="SkyNewsUK.uk" site_id="323">Sky News UK</channel>
     <channel lang="zh" xmltv_id="SonyMaxAsia.in" site_id="772">Sony Max Asia</channel>
     <channel lang="zh" xmltv_id="SonySABAsia.in" site_id="774">Sony SAB TV Asia</channel>
-    <channel lang="zh" xmltv_id="StarBharatIndia.hk" site_id="797">Star Bharat India</channel>
+    <channel lang="zh" xmltv_id="StarBharat.in" site_id="797">Star Bharat India</channel>
     <channel lang="zh" xmltv_id="StarChineseMoviesSouthEastAsia.hk" site_id="139">Star Chinese Movies South East Asia</channel>
-    <channel lang="zh" xmltv_id="StarGold.hk" site_id="793">Star Gold</channel>
-    <channel lang="zh" xmltv_id="StarPlusSoutheastAsia.hk" site_id="794">Star Plus Southeast Asia</channel>
+    <channel lang="zh" xmltv_id="StarGold.in" site_id="793">Star Gold</channel>
+    <channel lang="zh" xmltv_id="StarPlus.in" site_id="794">Star Plus Southeast Asia</channel>
     <channel lang="zh" xmltv_id="TFCAsiaPacific.ph" site_id="725">TFC Asia-Pacific</channel>
     <channel lang="zh" xmltv_id="Thrill.hk" site_id="125">Thrill</channel>
     <channel lang="zh" xmltv_id="TLCSoutheastAsia.us" site_id="213">TLC Southeast Asia</channel>
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
index 6a7fbb43..ed34e6a5 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
@@ -32,7 +32,7 @@
     <channel lang="es" xmltv_id="ClubMTV.us" site_id="469">Club MTV</channel>
     <channel lang="es" xmltv_id="CNBCEurope.us" site_id="204">CNBC Europe</channel>
     <channel lang="es" xmltv_id="CNNInternationalEurope.us" site_id="203">CNN International Europe</channel>
-    <channel lang="es" xmltv_id="ComedyCentralSpain.us" site_id="493">Comedy Central España</channel>
+    <channel lang="es" xmltv_id="ComedyCentralSpain.es" site_id="493">Comedy Central España</channel>
     <channel lang="es" xmltv_id="CosmopolitanTV.es" site_id="186">Cosmopolitan TV España</channel>
     <channel lang="es" xmltv_id="CrimenPlusInvestigacion.us" site_id="691">Crimen + Investigación</channel>
     <channel lang="es" xmltv_id="Cuatro.es" site_id="496">Cuatro</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index b204ca12..53866475 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -35,7 +35,7 @@
     <channel lang="ro" xmltv_id="CinemaxCentralEurope.us" site_id="cinemax">Cinemax Central Europe</channel>
     <channel lang="ro" xmltv_id="ClubMTV.us" site_id="club-mtv">Club MTV</channel>
     <channel lang="ro" xmltv_id="CNNInternationalEurope.us" site_id="cnn">CNN International Europe</channel>
-    <channel lang="ro" xmltv_id="ComedyCentralRomania.us" site_id="comedy-central">Comedy Central România</channel>
+    <channel lang="ro" xmltv_id="ComedyCentralRomania.ro" site_id="comedy-central">Comedy Central România</channel>
     <channel lang="ro" xmltv_id="CoolTV.hu" site_id="cool-tv">Cool TV</channel>
     <channel lang="ro" xmltv_id="CredoTV.ro" site_id="credo-tv">Credo TV</channel>
     <channel lang="ro" xmltv_id="CrimePlusInvestigationUK.us" site_id="crime-investigation">Crime + Investigation UK</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 dd517ac8..c07a4369 100644
--- a/sites/programme-tv.net/programme-tv.net_fr.channels.xml
+++ b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
@@ -63,7 +63,7 @@
     <channel lang="fr" xmltv_id="CNews.fr" site_id="cnews-30">C News</channel>
     <channel lang="fr" xmltv_id="CNNInternationalEurope.us" site_id="cnn-235">CNN International Europe</channel>
     <channel lang="fr" xmltv_id="ComediePlus.fr" site_id="comedieplus-27">Comédie +</channel>
-    <channel lang="fr" xmltv_id="ComedyCentralFrance.us" site_id="comedy-central-472">Comedy Central France</channel>
+    <channel lang="fr" xmltv_id="ComedyCentralFrance.fr" site_id="comedy-central-472">Comedy Central France</channel>
     <channel lang="fr" xmltv_id="CrimeDistrict.fr" site_id="crime-district-363">Crime District</channel>
     <channel lang="fr" xmltv_id="CStar.fr" site_id="cstar-28">C Star</channel>
     <channel lang="fr" xmltv_id="DasErste.de" site_id="das-erste-185">Das Erste</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 d258ccf6..f0216bca 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -62,7 +62,7 @@
     <channel lang="pl" xmltv_id="ClubMTV.us" site_id="mtv-dance-481">Club MTV</channel>
     <channel lang="pl" xmltv_id="CNBCEurope.us" site_id="cnbc-247">CNBC Europe</channel>
     <channel lang="pl" xmltv_id="CNNInternationalEurope.us" site_id="cnn-258">CNN International Europe</channel>
-    <channel lang="pl" xmltv_id="ComedyCentralPoland.us" site_id="comedy-central-63">Comedy Central Polska</channel>
+    <channel lang="pl" xmltv_id="ComedyCentralPoland.pl" site_id="comedy-central-63">Comedy Central Polska</channel>
     <channel lang="pl" xmltv_id="CrimePlusInvestigationPolsat.us" site_id="ci-polsat-257">Crime + Investigation Polsat</channel>
     <channel lang="pl" xmltv_id="CT1.cz" site_id="ct-1-241">CT 1</channel>
     <channel lang="pl" xmltv_id="CT2.cz" site_id="ct-2-243">CT 2</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
index 68c9514e..7519f8c7 100644
--- a/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be_be.channels.xml
@@ -45,7 +45,7 @@
     <channel lang="fr" xmltv_id="CinePlusFrisson.be" site_id="UID0304">Ciné+Frisson</channel>
     <channel lang="fr" xmltv_id="CinePlusPremier.be" site_id="UID0303">Ciné+Premier</channel>
     <channel lang="fr" xmltv_id="ClubRTL.be" site_id="UID50070">ClubRTL</channel>
-    <channel lang="fr" xmltv_id="ComedyCentralFrance.us" site_id="UID2068">Comedy Central F</channel>
+    <channel lang="fr" xmltv_id="ComedyCentralFrance.fr" site_id="UID2068">Comedy Central F</channel>
     <channel lang="fr" xmltv_id="CrimeDistrict.fr" site_id="UID0189">Crime District</channel>
     <channel lang="fr" xmltv_id="DiscoveryChannelFrance.us" site_id="UID0090">Discovery F</channel>
     <channel lang="fr" xmltv_id="DisneyChannelFrance.fr" site_id="UID2042">Disn Ch HD F</channel>
@@ -139,7 +139,7 @@
     <channel lang="nl" xmltv_id="Bruzz.be" site_id="UID2326">BRUZZ HD</channel>
     <channel lang="nl" xmltv_id="Canvas.be" site_id="UID50084">Canvas</channel>
     <channel lang="nl" xmltv_id="CartoonNetworkNederland.us" site_id="UID50022">Cartoon N</channel>
-    <channel lang="nl" xmltv_id="ComedyCentralNederland.us" site_id="UID50144">Comedy Central N</channel>
+    <channel lang="nl" xmltv_id="ComedyCentralNederlands.nl" site_id="UID50144">Comedy Central N</channel>
     <channel lang="nl" xmltv_id="DiscoveryChannelNederland.us" site_id="UID50017">Discovery N</channel>
     <channel lang="nl" xmltv_id="DiscoveryScienceUK.us" site_id="UID50029">Disc Science</channel>
     <channel lang="nl" xmltv_id="DisneyChannelNederland.nl" site_id="UID50329">Disn Ch N</channel>
diff --git a/sites/rev.bs/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
index 1b96627e..42b25203 100644
--- a/sites/rev.bs/rev.bs_bs.channels.xml
+++ b/sites/rev.bs/rev.bs_bs.channels.xml
@@ -35,7 +35,7 @@
     <channel lang="en" xmltv_id="CMTMusic.us" site_id="390">CMT Music</channel>
     <channel lang="en" xmltv_id="CNBCUS.us" site_id="403">CNBC US</channel>
     <channel lang="en" xmltv_id="CNNInternationalLatinAmerica.us" site_id="408">CNN International Latin America</channel>
-    <channel lang="en" xmltv_id="CNNUS.us" site_id="405">CNN USA</channel>
+    <channel lang="en" xmltv_id="CNN.us" site_id="405">CNN USA</channel>
     <channel lang="en" xmltv_id="ComedyCentralEast.us" site_id="354">Comedy Central East</channel>
     <channel lang="en" xmltv_id="ComedyTV.us" site_id="355">Comedy TV</channel>
     <channel lang="en" xmltv_id="CookingChannel.us" site_id="251">Cooking 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 db54a4e8..b73f36f7 100644
--- a/sites/siba.com.co/siba.com.co_co.channels.xml
+++ b/sites/siba.com.co/siba.com.co_co.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="es" xmltv_id="ClaromusicaTV.co" site_id="566">Claro música TV</channel>
     <channel lang="es" xmltv_id="ClaroSportsChile.mx" site_id="602">Claro Sports Chile</channel>
     <channel lang="es" xmltv_id="CNNenEspanol.us" site_id="413">CNN en Español</channel>
-    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSur.us" site_id="702">Comedy Central Latinoamérica Sur</channel>
+    <channel lang="es" xmltv_id="ComedyCentralLatinAmericaSouth.us" site_id="702">Comedy Central Latinoamérica Sur</channel>
     <channel lang="es" xmltv_id="Cosmovision.co" site_id="417">Cosmovisión</channel>
     <channel lang="es" xmltv_id="Cristovision.co" site_id="418">Cristovisión</channel>
     <channel lang="es" xmltv_id="DiscoveryChannelLatinAmerica.us" site_id="423">Discovery Channel Latinoamérica</channel>
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index 8b3e65da..ba0279bb 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -60,8 +60,8 @@
     <channel lang="en" xmltv_id="Channel5.uk" site_id="1800">Channel 5</channel>
     <channel lang="en" xmltv_id="Channel5Plus1.uk" site_id="1839">Channel 5 +1</channel>
     <channel lang="en" xmltv_id="ClublandTV.uk" site_id="4505">Clubland TV</channel>
-    <channel lang="en" xmltv_id="ComedyCentralExtraUK.us" site_id="1813">Comedy Central Extra UK</channel>
-    <channel lang="en" xmltv_id="ComedyCentralUK.us" site_id="4056">Comedy Central</channel>
+    <channel lang="en" xmltv_id="ComedyCentralExtra.uk" site_id="1813">Comedy Central Extra UK</channel>
+    <channel lang="en" xmltv_id="ComedyCentralUK.uk" site_id="4056">Comedy Central</channel>
     <channel lang="en" xmltv_id="CourtTVUK.us" site_id="1207">Court TV</channel>
     <channel lang="en" xmltv_id="CraftExtra.uk" site_id="3357">Craft Extra</channel>
     <channel lang="en" xmltv_id="CreateandCraft.uk" site_id="1245">Create and Craft</channel>
diff --git a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
index efa5dacc..6b9755da 100644
--- a/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
+++ b/sites/telecablesat.fr/telecablesat.fr_fr.channels.xml
@@ -75,7 +75,7 @@
     <channel lang="fr" xmltv_id="CNews.fr" site_id="226">CNEWS</channel>
     <channel lang="en" xmltv_id="CNNInternationalEurope.us" site_id="53">CNN</channel>
     <channel lang="fr" xmltv_id="ComediePlus.fr" site_id="54">Comédie+</channel>
-    <channel lang="fr" xmltv_id="ComedyCentralFrance.us" site_id="2752">Comedy Central</channel>
+    <channel lang="fr" xmltv_id="ComedyCentralFrance.fr" site_id="2752">Comedy Central</channel>
     <channel lang="fr" xmltv_id="CrimeDistrict.fr" site_id="2037">Crime District</channel>
     <channel lang="fr" xmltv_id="CStar.fr" site_id="458">CSTAR</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="13">Das Erste</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 1f239227..abce0c76 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -43,7 +43,7 @@
     <channel lang="de" xmltv_id="BoomerangGermany.us" site_id="54">Boomerang Deutschland</channel>
     <channel lang="de" xmltv_id="BRFernsehenSud.de" site_id="55">Bayerisches Fernsehen Süd</channel>
     <channel lang="de" xmltv_id="CartoonNetworkGermany.us" site_id="83">Cartoon Network Deutschland</channel>
-    <channel lang="de" xmltv_id="ComedyCentralHungary.us" site_id="110">Comedy Central Hungary</channel>
+    <channel lang="de" xmltv_id="ComedyCentralHungary.hu" site_id="110">Comedy Central Hungary</channel>
     <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="1334">Crime + Investigation Deutschland</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="25">Das Erste</channel>
     <channel lang="de" xmltv_id="DAZN1Germany.uk" site_id="1452">DAZN 1 Deutschland</channel>
diff --git a/sites/tvguide.com/tvguide.com_us.channels.xml b/sites/tvguide.com/tvguide.com_us.channels.xml
index 8380c794..a42c4b0d 100644
--- a/sites/tvguide.com/tvguide.com_us.channels.xml
+++ b/sites/tvguide.com/tvguide.com_us.channels.xml
@@ -13,7 +13,7 @@
     <channel lang="en" xmltv_id="CinemaxEast.us" site_id="9100001138#9233009829">Cinemax East</channel>
     <channel lang="en" xmltv_id="CMTEast.us" site_id="9100001138#9200012085">CMT East</channel>
     <channel lang="en" xmltv_id="CNBCUS.us" site_id="9100001138#9200009413">CNBC US</channel>
-    <channel lang="en" xmltv_id="CNNUS.us" site_id="9100001138#9233013812">CNN USA</channel>
+    <channel lang="en" xmltv_id="CNN.us" site_id="9100001138#9233013812">CNN USA</channel>
     <channel lang="en" xmltv_id="ComedyCentralEast.us" site_id="9100001138#9200000657">Comedy Central East</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelEast.us" site_id="9100001138#9233004102">Discovery Channel East</channel>
     <channel lang="en" xmltv_id="DiscoveryLifeChannel.us" site_id="9100001138#9233013857">Discovery Life Channel</channel>
diff --git a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
index ed2903cc..52eb63b1 100644
--- a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
+++ b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="jp" xmltv_id="ChannelGinga.jp" site_id="120_135_65534">Channel Ginga</channel>
     <channel lang="jp" xmltv_id="ChannelNeco.jp" site_id="120_556_65406">Channel Neco</channel>
     <channel lang="jp" xmltv_id="CNNj.us" site_id="120_180_65406">CNN J</channel>
-    <channel lang="jp" xmltv_id="CNNUS.us" site_id="120_249_65406">CNN USA</channel>
+    <channel lang="jp" xmltv_id="CNN.us" site_id="120_249_65406">CNN USA</channel>
     <channel lang="jp" xmltv_id="DanceChannel.jp" site_id="120_105_65406">Dance Channel</channel>
     <channel lang="jp" xmltv_id="DiscoveryChannelJapan.us" site_id="120_121_65534">Discovery Channel Japan</channel>
     <channel lang="jp" xmltv_id="DisneyChannelJapan.jp" site_id="120_183_65406">Disney Channel Japan</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
index da53731e..ae18d00b 100644
--- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
@@ -11,8 +11,8 @@
     <channel lang="hu" xmltv_id="CartoonNetworkCentralEasternEurope.us" site_id="91">Cartoon Network Central &amp; Eastern Europe</channel>
     <channel lang="hu" xmltv_id="CinemaxCentralEurope.us" site_id="47">Cinemax Central Europe</channel>
     <channel lang="hu" xmltv_id="CNNInternationalEurope.us" site_id="4">CNN International Europe</channel>
-    <channel lang="hu" xmltv_id="ComedyCentralFamilyHungary.us" site_id="316">Comedy Central Family Hungary</channel>
-    <channel lang="hu" xmltv_id="ComedyCentralHungary.us" site_id="194">Comedy Central Hungary</channel>
+    <channel lang="hu" xmltv_id="ComedyCentralFamilyHungary.hu" site_id="316">Comedy Central Family Hungary</channel>
+    <channel lang="hu" xmltv_id="ComedyCentralHungary.hu" site_id="194">Comedy Central Hungary</channel>
     <channel lang="hu" xmltv_id="CoolTV.hu" site_id="79">Cool TV</channel>
     <channel lang="hu" xmltv_id="DaVinciHungary.de" site_id="202">Da Vinci Hungary</channel>
     <channel lang="hu" xmltv_id="DigiAnimalWorld.ro" site_id="249">Digi Animal World</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_hu.channels.xml b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
index 1f5e0c50..778191d7 100644
--- a/sites/tvprofil.com/tvprofil.com_hu.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
@@ -6,8 +6,8 @@
     <channel lang="hr" xmltv_id="Arena4.hu" site_id="hu/tvmusor#arena4-hu">Arena 4</channel>
     <channel lang="hr" xmltv_id="ATV.hu" site_id="hu/tvmusor#atv-hu">ATV</channel>
     <channel lang="hr" xmltv_id="AXNCentralEurope.us" site_id="hu/tvmusor#axn-hu">AXN Central Europe</channel>
-    <channel lang="hr" xmltv_id="ComedyCentralFamilyHungary.us" site_id="hu/tvmusor#comedy-central-family-hu">Comedy Central Family Hungary</channel>
-    <channel lang="hr" xmltv_id="ComedyCentralHungary.us" site_id="hu/tvmusor#comedy-central-hu">Comedy Central Hungary</channel>
+    <channel lang="hr" xmltv_id="ComedyCentralFamilyHungary.hu" site_id="hu/tvmusor#comedy-central-family-hu">Comedy Central Family Hungary</channel>
+    <channel lang="hr" xmltv_id="ComedyCentralHungary.hu" site_id="hu/tvmusor#comedy-central-hu">Comedy Central Hungary</channel>
     <channel lang="hr" xmltv_id="CoolTV.hu" site_id="hu/tvmusor#cooltv">Cool TV</channel>
     <channel lang="hr" xmltv_id="D1TV.hu" site_id="hu/tvmusor#d1-tv-hu">D1 TV</channel>
     <channel lang="hr" xmltv_id="DigiAnimalWorld.ro" site_id="hu/tvmusor#digi-animal-world-hu">Digi Animal World</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 882a6bfd..b22dfb68 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -112,7 +112,6 @@
     <channel lang="en" xmltv_id="CNBC.us" site_id="10139">CNBC</channel>
     <channel lang="en" xmltv_id="CNBCWest.us" site_id="33620">CNBC West</channel>
     <channel lang="en" xmltv_id="CNBCWorld.us" site_id="26849">CNBC World</channel>
-    <channel lang="en" xmltv_id="CNNUS.us" site_id="58646">CNN</channel>
     <channel lang="en" xmltv_id="CNN.us" site_id="58646">CNN</channel>
     <channel lang="en" xmltv_id="CNNenEspanol.us" site_id="58631">CNN en Español</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.us" site_id="40821">CNN International Asia</channel>
diff --git a/sites/virginmedia.com/virginmedia.com_uk.channels.xml b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
index c01cc13c..9e315297 100644
--- a/sites/virginmedia.com/virginmedia.com_uk.channels.xml
+++ b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
@@ -55,8 +55,8 @@
     <channel lang="en" xmltv_id="ColorsCineplex.in" site_id="1927">Colors Cineplex</channel>
     <channel lang="en" xmltv_id="ColorsGujarati.in" site_id="2166">Colors Gujarati</channel>
     <channel lang="en" xmltv_id="ColorsRishteyEurope.in" site_id="1675">Colors Rishtey</channel>
-    <channel lang="en" xmltv_id="ComedyCentralExtraUK.us" site_id="174">Comedy Central Extra UK</channel>
-    <channel lang="en" xmltv_id="ComedyCentralUK.us" site_id="1497">Comedy Central</channel>
+    <channel lang="en" xmltv_id="ComedyCentralExtra.uk" site_id="174">Comedy Central Extra UK</channel>
+    <channel lang="en" xmltv_id="ComedyCentralUK.uk" site_id="1497">Comedy Central</channel>
     <channel lang="en" xmltv_id="CreateandCraft.uk" site_id="1717">Create and Craft</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationUK.us" site_id="568">Crime &amp; Investigation UK</channel>
     <channel lang="en" xmltv_id="Davejavu.uk" site_id="171">Dave ja vu</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
index 8f17a5e7..f28ae5fe 100644
--- a/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv_nl.channels.xml
@@ -23,8 +23,8 @@
     <channel lang="nl" xmltv_id="CNNInternationalEurope.us" site_id="NL_000115_019447">CNN International Europe</channel>
     <channel lang="nl" xmltv_id="Canvas.be" site_id="NL_000032_019226">Canvas</channel>
     <channel lang="nl" xmltv_id="CartoonNetworkNederland.us" site_id="NL_000088_019251">Cartoon Network Nederland</channel>
-    <channel lang="nl" xmltv_id="ComedyCentralExtraUK.us" site_id="NL_000059_019252">Comedy Central Extra UK</channel>
-    <channel lang="nl" xmltv_id="ComedyCentralNederland.us" site_id="NL_000015_019166">Comedy Central Nederland</channel>
+    <channel lang="nl" xmltv_id="ComedyCentralExtra.uk" site_id="NL_000059_019252">Comedy Central Extra UK</channel>
+    <channel lang="nl" xmltv_id="ComedyCentralNederlands.nl" site_id="NL_000015_019166">Comedy Central Nederland</channel>
     <channel lang="nl" xmltv_id="CrimePlusInvestigationUK.us" site_id="NL_000057_019493">Crime + Investigation UK</channel>
     <channel lang="nl" xmltv_id="DiscoveryChannelNederland.us" site_id="NL_000017_019222">Discovery Channel Nederland</channel>
     <channel lang="nl" xmltv_id="DiscoveryScience.us" site_id="NL_000075_019246">Discovery Science</channel>