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 6a3c60a4..6bde6a14 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -71,7 +71,7 @@
     <channel lang="ms" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="336">CNN</channel>
     <channel lang="ms" xmltv_id="Colors.in" site_id="365">Colors</channel>
     <channel lang="ms" xmltv_id="ColorsTamil.in" site_id="298">Colors Tamil</channel>
-    <channel lang="ms" xmltv_id="CrimePlusInvestigationAsia.us" site_id="369">Crime + Investigation</channel>
+    <channel lang="ms" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="369">Crime + Investigation</channel>
     <channel lang="ms" xmltv_id="CTiAsia.tw" site_id="424">CTI TV</channel>
     <channel lang="ms" xmltv_id="DiscoveryAsiaThailand.th" site_id="136">Discovery Asia</channel>
     <channel lang="ms" xmltv_id="DiscoveryChannelHDIndonesia.id" site_id="376">Discovery Channel</channel>
diff --git a/sites/bt.com/bt.com_uk.channels.xml b/sites/bt.com/bt.com_uk.channels.xml
index d41edbbc..612372d9 100644
--- a/sites/bt.com/bt.com_uk.channels.xml
+++ b/sites/bt.com/bt.com_uk.channels.xml
@@ -36,7 +36,7 @@
     <channel lang="en" xmltv_id="BBCTwoEngland.uk" site_id="hstw">BBC Two England</channel>
     <channel lang="en" xmltv_id="BBCTwoHD.uk" site_id="hsxw">BBC Two HD</channel>
     <channel lang="en" xmltv_id="BBCTwoWales.uk" site_id="hs4k">BBC Two Wales</channel>
-    <channel lang="en" xmltv_id="BlazeUK.uk" site_id="hswv">Blaze UK</channel>
+    <channel lang="en" xmltv_id="Blaze.uk" site_id="hswv">Blaze UK</channel>
     <channel lang="en" xmltv_id="BoomerangUK.uk" site_id="hstb">Boomerang UK</channel>
     <channel lang="en" xmltv_id="BoxNation.uk" site_id="hspk">Box Nation</channel>
     <channel lang="en" xmltv_id="BTSport1.uk" site_id="hspc">BT Sport 1</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index fa59f01a..8994499b 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="cinema-one">Cinema One</channel>
     <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="cinemax">Cinemax</channel>
     <channel lang="en" xmltv_id="CNNPhilippines.ph" site_id="cnn-philippines">CNN Philippines</channel>
-    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crime-investigation">Crime &amp; Investigation</channel>
+    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="crime-investigation">Crime &amp; Investigation</channel>
     <channel lang="en" xmltv_id="IBC13.ph" site_id="ibc-tv-13">IBC 13</channel>
     <channel lang="en" xmltv_id="ETC.ph" site_id="etc">ETC</channel>
     <channel lang="en" xmltv_id="GEM.sg" site_id="gem">GEM</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 0de98a81..de89feae 100644
--- a/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
+++ b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="es" xmltv_id="AbyaYalaTV.bo" site_id="ABYA YALA">Abya Yala TV</channel>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="A&amp;E Mundo">A&amp;E</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="AMC">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="AMC">AMC</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="Animal Planet">Animal Planet</channel>
     <channel lang="es" xmltv_id="ATB.bo" site_id="ATB (4)">ATB</channel>
     <channel lang="es" xmltv_id="AXNCentralAmerica.us" site_id="AXN">AXN</channel>
diff --git a/sites/directv.com.ar/directv.com.ar_ar.channels.xml b/sites/directv.com.ar/directv.com.ar_ar.channels.xml
index b6647e88..90712768 100644
--- a/sites/directv.com.ar/directv.com.ar_ar.channels.xml
+++ b/sites/directv.com.ar/directv.com.ar_ar.channels.xml
@@ -2,23 +2,14 @@
 <site site="directv.com.ar">
   <channels>
     <channel lang="es" xmltv_id="24Horas.cl" site_id="708#24HR">24 Horas</channel>
-    <channel lang="es" xmltv_id="A24HD.ar" site_id="719#A24HD">A24 HD</channel>
     <channel lang="es" xmltv_id="A24.ar" site_id="719#A24">A24</channel>
-    <channel lang="es" xmltv_id="AEHDSouth.us" site_id="207#A&amp;EHD">A&amp;E HD</channel>
     <channel lang="es" xmltv_id="AESouth.us" site_id="207#A&amp;E">A&amp;E</channel>
-    <channel lang="es" xmltv_id="AMCSouth.us" site_id="210#AMC">AMC</channel>
-    <channel lang="es" xmltv_id="AMCHDSouth.us" site_id="210#AMCHD">AMC HD</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="210#AMC">AMC</channel>
     <channel lang="es" xmltv_id="AXNSouth.us" site_id="209#AXN">AXN</channel>
-    <channel lang="es" xmltv_id="AXNHDSouth.us" site_id="209#AXNHD">AXN HD</channel>
     <channel lang="es" xmltv_id="AmericaTV.ar" site_id="120#AME2">América TV (ARG)</channel>
-    <channel lang="es" xmltv_id="AmericaTVHD.ar" site_id="1120#AME2HD">América TV HD (ARG)</channel>
-    <channel lang="es" xmltv_id="AnimalPlanetHDLatinAmerica.us" site_id="734#ANMLHD">Animal Planet HD</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="734#ANML">Animal Planet</channel>
     <channel lang="es" xmltv_id="Antena3Internacional.es" site_id="762#ANT3">Antena 3 Internacional</channel>
-    <channel lang="es" xmltv_id="Antena3InternacionalHD.es" site_id="1762#ANT3HD">Antena 3 HD</channel>
-    <channel lang="es" xmltv_id="AtrescineInternacionalHD.es" site_id="1519#A3CHD">A3Cine HD</channel>
     <channel lang="es" xmltv_id="AtreseriesInternacional.es" site_id="214#A3SE">Atres Series</channel>
-    <channel lang="es" xmltv_id="AtreseriesInternacionalHD.es" site_id="214#A3SEHD">Atres Series HD</channel>
     <channel lang="es" xmltv_id="BBCWorldNewsLatinAmerica.uk" site_id="768#BBC">BBC World News</channel>
     <channel lang="es" xmltv_id="BabyTVHD.uk" site_id="1317#BABYTV">Baby TV HD</channel>
     <channel lang="es" xmltv_id="BloombergTelevision.us" site_id="710#BTV">Bloomberg Television</channel>
@@ -31,7 +22,6 @@
     <channel lang="es" xmltv_id="CNNInternationalLatinAmerica.us" site_id="706#CNNI">CNN International</channel>
     <channel lang="es" xmltv_id="CNNenEspanol.us" site_id="704#CNNE">CNN en español</channel>
     <channel lang="es" xmltv_id="Cablenoticias.co" site_id="727#CNOT">Cable Noticias de Colombia</channel>
-    <channel lang="es" xmltv_id="Canal26HD.ar" site_id="720#CA26HD">Canal 26 HD</channel>
     <channel lang="es" xmltv_id="Canal26.ar" site_id="720#CA26">Canal 26 (ARG).</channel>
     <channel lang="es" xmltv_id="Canal3Rosario.ar" site_id="134#TRES">EL TRES Rosario</channel>
     <channel lang="es" xmltv_id="Canal7Jujuy.ar" site_id="133#C7">Canal 7 de Jujuy</channel>
diff --git a/sites/directv.com.uy/directv.com.uy_uy.channels.xml b/sites/directv.com.uy/directv.com.uy_uy.channels.xml
index 512be01e..8f32294b 100644
--- a/sites/directv.com.uy/directv.com.uy_uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy_uy.channels.xml
@@ -2,16 +2,11 @@
 <site site="directv.com.uy">
   <channels>
     <channel lang="es" xmltv_id="24Horas.cl" site_id="708#24HR">24 Horas</channel>
-    <channel lang="es" xmltv_id="AMCHDSouth.us" site_id="210#AMCHD">AMC HD</channel>
-    <channel lang="es" xmltv_id="AMCSouth.us" site_id="210#AMC">AMC</channel>
-    <channel lang="es" xmltv_id="AnimalPlanetHDLatinAmerica.us" site_id="734#ANMLHD">Animal Planet HD</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="210#AMC">AMC</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="734#ANML">Animal Planet</channel>
     <channel lang="es" xmltv_id="Antena3Internacional.es" site_id="762#ANT3">Antena 3 Internacional</channel>
-    <channel lang="es" xmltv_id="Antena3InternacionalHD.es" site_id="1762#ANT3HD">Antena 3  HD</channel>
     <channel lang="es" xmltv_id="AtrescineInternacionalHD.es" site_id="1519#A3CHD">A3Cine HD</channel>
     <channel lang="es" xmltv_id="AtreseriesInternacional.es" site_id="214#A3SE">Atres Series</channel>
-    <channel lang="es" xmltv_id="AtreseriesInternacionalHD.es" site_id="214#A3SEHD">Atres Series HD</channel>
-    <channel lang="es" xmltv_id="AXNHDSouth.us" site_id="209#AXNHD">AXN HD</channel>
     <channel lang="es" xmltv_id="AXNSouth.us" site_id="209#AXN">AXN</channel>
     <channel lang="es" xmltv_id="BabyTVHD.uk" site_id="1317#BABYTV">Baby TV HD</channel>
     <channel lang="es" xmltv_id="BBCWorldNewsLatinAmerica.uk" site_id="768#BBC">BBC World News</channel>
@@ -22,7 +17,6 @@
     <channel lang="es" xmltv_id="Canal10.uy" site_id="1193#CN10HD">Canal 10 (URU)</channel>
     <channel lang="es" xmltv_id="Cablenoticias.co" site_id="727#CNOT">Cable Noticias de Colombia</channel>
     <channel lang="es" xmltv_id="Canal26.ar" site_id="720#CA26">Canal 26 (ARG).</channel>
-    <channel lang="es" xmltv_id="Canal26HD.ar" site_id="720#CA26HD">Canal 26 HD</channel>
     <channel lang="es" xmltv_id="CanalLuz.ar" site_id="354#CLUZ">Canal LUZ (ARG)</channel>
     <channel lang="es" xmltv_id="CanalOrbe21.ar" site_id="351#ORBE21">Canal 21 (ARG)</channel>
     <channel lang="es" xmltv_id="CaracolInternacional.co" site_id="772#CRCL">Caracol Internacional</channel>
@@ -30,7 +24,6 @@
     <channel lang="es" xmltv_id="CartoonNetworkHDSouthAtlantic.us" site_id="1304#TOONHD">Cartoon Network HD</channel>
     <channel lang="es" xmltv_id="CartoonNetworkSouthAtlantic.us" site_id="304#TOON">Cartoon Network (Sur)</channel>
     <channel lang="es" xmltv_id="CGTNSpanish.cn" site_id="790#CGTN">CGTN-Español</channel>
-    <channel lang="es" xmltv_id="CinecanalHDSouth.us" site_id="1507#CCHD">Cinecanal HD</channel>
     <channel lang="es" xmltv_id="CinecanalSouth.us" site_id="507#CC">Cinecanal (COL)</channel>
     <channel lang="es" xmltv_id="CineLatino.mx" site_id="514#CL">Cinelatino</channel>
     <channel lang="es" xmltv_id="CinemaxHDSouth.us" site_id="509#CMAXHD">Cinemax HD (Sur)</channel>
diff --git a/sites/directv.com/directv.com_us.channels.xml b/sites/directv.com/directv.com_us.channels.xml
index 89eb1dff..27d9c679 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="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>
-    <channel lang="en" xmltv_id="CrimePlusInvestigationNetworkUSA.us" site_id="571">Crime + Investigation Network USA</channel>
+    <channel lang="en" xmltv_id="CrimePlusInvestigation.us" site_id="571">Crime + Investigation Network USA</channel>
     <channel lang="en" xmltv_id="CSPAN.us" site_id="350">C-SPAN</channel>
     <channel lang="en" xmltv_id="CSPAN2.us" site_id="351">C-SPAN 2</channel>
     <channel lang="en" xmltv_id="CTN.us" site_id="376">CTN</channel>
diff --git a/sites/gatotv.com/gatotv.com_ar.channels.xml b/sites/gatotv.com/gatotv.com_ar.channels.xml
index 67530139..2a0e76dd 100644
--- a/sites/gatotv.com/gatotv.com_ar.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ar.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_argentina">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_argentina">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AmericaTV.ar" site_id="america_tv_argentina">América TV</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_argentina">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_argentina">AXN Latinoamérica</channel>
diff --git a/sites/gatotv.com/gatotv.com_bo.channels.xml b/sites/gatotv.com/gatotv.com_bo.channels.xml
index a0bdcbb5..87e09ada 100644
--- a/sites/gatotv.com/gatotv.com_bo.channels.xml
+++ b/sites/gatotv.com/gatotv.com_bo.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_bolivia">A&amp;E</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_bolivia">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_bolivia">AMC</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_bolivia">Animal Planet</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_bolivia">AXN</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_bolivia">Boomerang</channel>
diff --git a/sites/gatotv.com/gatotv.com_cl.channels.xml b/sites/gatotv.com/gatotv.com_cl.channels.xml
index 919cb0cd..a258bbf4 100644
--- a/sites/gatotv.com/gatotv.com_cl.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cl.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEChile.cl" site_id="a_y_e_chile">A&amp;E Chile</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_chile">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_chile">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_chile">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_chile">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_chile">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_co.channels.xml b/sites/gatotv.com/gatotv.com_co.channels.xml
index 68b944ad..3612e200 100644
--- a/sites/gatotv.com/gatotv.com_co.channels.xml
+++ b/sites/gatotv.com/gatotv.com_co.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_colombia">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCColombia.co" site_id="amc_colombia">AMC Colombia</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_colombia">AMC Colombia</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_colombia">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_colombia">Boomerang Latin America</channel>
     <channel lang="es" xmltv_id="Canal1.co" site_id="1_colombia">Canal 1</channel>
diff --git a/sites/gatotv.com/gatotv.com_cr.channels.xml b/sites/gatotv.com/gatotv.com_cr.channels.xml
index 4c37d27a..50db481d 100644
--- a/sites/gatotv.com/gatotv.com_cr.channels.xml
+++ b/sites/gatotv.com/gatotv.com_cr.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_costa_rica">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_costa_rica">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_costa_rica">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_costa_rica">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_costa_rica">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_costa_rica">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_do.channels.xml b/sites/gatotv.com/gatotv.com_do.channels.xml
index 478171ca..cfbf594a 100644
--- a/sites/gatotv.com/gatotv.com_do.channels.xml
+++ b/sites/gatotv.com/gatotv.com_do.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_republica_dominicana">A&amp;E</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_republica_dominicana">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_republica_dominicana">AMC</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_republica_dominicana">Animal Planet</channel>
     <channel lang="es" xmltv_id="Antena7.do" site_id="7_republica_dominicana">Antena 7</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_republica_dominicana">AXN</channel>
diff --git a/sites/gatotv.com/gatotv.com_ec.channels.xml b/sites/gatotv.com/gatotv.com_ec.channels.xml
index a5b6307f..200217ad 100644
--- a/sites/gatotv.com/gatotv.com_ec.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ec.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_ecuador">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_ecuador">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_ecuador">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_ecuador">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_ecuador">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_ecuador">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index bba373f2..4ecb95e1 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -9,7 +9,7 @@
     <channel lang="es" xmltv_id="AXNWhite.us" site_id="axn_white_espana">AXN White España</channel>
     <channel lang="es" xmltv_id="BarcaTV.es" site_id="barca_tv">Barça TV</channel>
     <channel lang="es" xmltv_id="BeMad.es" site_id="be_mad">Be Mad</channel>
-    <channel lang="es" xmltv_id="BlazeSpain.us" site_id="blaze_espana">Blaze España</channel>
+    <channel lang="es" xmltv_id="BlazeSpain.es" site_id="blaze_espana">Blaze España</channel>
     <channel lang="es" xmltv_id="BoingSpain.it" site_id="boing_espana">Boing España</channel>
     <channel lang="es" xmltv_id="Calle13.es" site_id="calle_13">Calle 13</channel>
     <channel lang="es" xmltv_id="CanalCocina.es" site_id="canal_cocina">Canal Cocina</channel>
diff --git a/sites/gatotv.com/gatotv.com_gt.channels.xml b/sites/gatotv.com/gatotv.com_gt.channels.xml
index c1bbafbe..2edf7664 100644
--- a/sites/gatotv.com/gatotv.com_gt.channels.xml
+++ b/sites/gatotv.com/gatotv.com_gt.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_guatemala">A&amp;E Andes</channel>
-    <channel lang="es" xmltv_id="AMCMexico.mx" site_id="amc_guatemala">AMC México</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_guatemala">AMC México</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_guatemala">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_guatemala">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="AztecaGuatemala.gt" site_id="azteca_guatemala">Azteca Guatemala</channel>
diff --git a/sites/gatotv.com/gatotv.com_hn.channels.xml b/sites/gatotv.com/gatotv.com_hn.channels.xml
index b82fb48d..787ec620 100644
--- a/sites/gatotv.com/gatotv.com_hn.channels.xml
+++ b/sites/gatotv.com/gatotv.com_hn.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_honduras">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_honduras">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_honduras">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_honduras">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_honduras">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_honduras">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_mx.channels.xml b/sites/gatotv.com/gatotv.com_mx.channels.xml
index 123d346f..97f5c537 100644
--- a/sites/gatotv.com/gatotv.com_mx.channels.xml
+++ b/sites/gatotv.com/gatotv.com_mx.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="es" xmltv_id="ADN40.mx" site_id="adn_40">ADN 40</channel>
     <channel lang="es" xmltv_id="AdrenalinaSportsNetwork.us" site_id="adrenalina_sports_network">Adrenalina Sports Network</channel>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_mexico">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCMexico.mx" site_id="amc_mexico">AMC México</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_mexico">AMC México</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_mexico">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="APlus.mx" site_id="a_mas">A+</channel>
     <channel lang="es" xmltv_id="AprendeTV.mx" site_id="aprende">Aprende TV</channel>
diff --git a/sites/gatotv.com/gatotv.com_ni.channels.xml b/sites/gatotv.com/gatotv.com_ni.channels.xml
index d2bf350b..a1212988 100644
--- a/sites/gatotv.com/gatotv.com_ni.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ni.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_nicaragua">A&amp;E Andes</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_nicaragua">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_nicaragua">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_nicaragua">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_nicaragua">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_nicaragua">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_pa.channels.xml b/sites/gatotv.com/gatotv.com_pa.channels.xml
index bd156140..2d5fab56 100644
--- a/sites/gatotv.com/gatotv.com_pa.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pa.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_panama">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_panama">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_panama">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_panama">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_panama">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_panama">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_pe.channels.xml b/sites/gatotv.com/gatotv.com_pe.channels.xml
index 51fe0124..9caa03d1 100644
--- a/sites/gatotv.com/gatotv.com_pe.channels.xml
+++ b/sites/gatotv.com/gatotv.com_pe.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_peru">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_peru">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_peru">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AmericaTelevision.pe" site_id="america_television_peru">América</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_peru">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="ATV.pe" site_id="atv">ATV</channel>
diff --git a/sites/gatotv.com/gatotv.com_py.channels.xml b/sites/gatotv.com/gatotv.com_py.channels.xml
index bd07e283..dfda4ae3 100644
--- a/sites/gatotv.com/gatotv.com_py.channels.xml
+++ b/sites/gatotv.com/gatotv.com_py.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_paraguay">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_paraguay">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_paraguay">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_paraguay">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_paraguay">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_sv.channels.xml b/sites/gatotv.com/gatotv.com_sv.channels.xml
index 09a57f93..194b264e 100644
--- a/sites/gatotv.com/gatotv.com_sv.channels.xml
+++ b/sites/gatotv.com/gatotv.com_sv.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_el_salvador">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_el_salvador">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_el_salvador">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_el_salvador">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_el_salvador">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_el_salvador">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_uy.channels.xml b/sites/gatotv.com/gatotv.com_uy.channels.xml
index 1881ac0b..088e53f6 100644
--- a/sites/gatotv.com/gatotv.com_uy.channels.xml
+++ b/sites/gatotv.com/gatotv.com_uy.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_uruguay">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_uruguay">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_uruguay">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_uruguay">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_uruguay">Boomerang Latin America</channel>
diff --git a/sites/gatotv.com/gatotv.com_ve.channels.xml b/sites/gatotv.com/gatotv.com_ve.channels.xml
index 98139d1d..8dda76d1 100644
--- a/sites/gatotv.com/gatotv.com_ve.channels.xml
+++ b/sites/gatotv.com/gatotv.com_ve.channels.xml
@@ -2,7 +2,7 @@
 <site site="gatotv.com">
   <channels>
     <channel lang="es" xmltv_id="AEPanregional.us" site_id="a_y_e_venezuela">A&amp;E Latinoamérica</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="amc_venezuela">AMC Latin America</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="amc_venezuela">AMC Latin America</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="animal_planet_venezuela">Animal Planet Latinoamérica</channel>
     <channel lang="es" xmltv_id="AXNPacific.us" site_id="axn_venezuela">AXN Latinoamérica</channel>
     <channel lang="es" xmltv_id="BoomerangLatinAmerica.us" site_id="boomerang_venezuela">Boomerang Latin America</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 a28c455c..9388e551 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -16,9 +16,9 @@
     <channel lang="it" xmltv_id="BoomerangItalyPlus1.it" site_id="DTH#479">Boomerang Italia +1</channel>
     <channel lang="it" xmltv_id="Caccia.it" site_id="DTH#520">Caccia</channel>
     <channel lang="it" xmltv_id="Canale5.it" site_id="DTH#10354">Canale 5</channel>
+    <channel lang="it" xmltv_id="CartoonitoItaly.it" site_id="DTH#8132">Cartoonito Italia</channel>
     <channel lang="it" xmltv_id="CartoonNetworkIndia.in" site_id="DTH#9693">Cartoon Network India</channel>
     <channel lang="it" xmltv_id="CartoonNetworkPlus1Italy.it" site_id="DTH#476">Cartoon Network Italia +1</channel>
-    <channel lang="it" xmltv_id="CartoonitoItaly.it" site_id="DTH#8132">Cartoonito Italia</channel>
     <channel lang="it" xmltv_id="Cielo.it" site_id="DTH#8133">Cielo</channel>
     <channel lang="it" xmltv_id="Cine34.it" site_id="DTH#10893">Cine 34</channel>
     <channel lang="it" xmltv_id="ClassCNBC.us" site_id="DTH#308">Class CNBC</channel>
@@ -27,7 +27,6 @@
     <channel lang="it" xmltv_id="CNNInternationalEurope.us" site_id="DTH#312">CNN International Europe</channel>
     <channel lang="it" xmltv_id="ComedyCentralItaly.it" site_id="DTH#318">Comedy Central Italia</channel>
     <channel lang="it" xmltv_id="ComedyCentralPlus1Italy.it" site_id="DTH#8353">Comedy Central Italia +1</channel>
-    <channel lang="it" xmltv_id="CrimePlusInvestigationHDItaly.it" site_id="DTH#11216">Crime + Investigation HD Italy</channel>
     <channel lang="it" xmltv_id="CrimePlusInvestigationItaly.it" 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>
@@ -70,14 +69,14 @@
     <channel lang="it" xmltv_id="MotorTrend.it" site_id="DTH#8130">Motor Trend</channel>
     <channel lang="it" xmltv_id="MTVItaly.it" site_id="DTH#9195">MTV HD</channel>
     <channel lang="it" xmltv_id="MTVMusicItaly.it" site_id="DTH#528">MTV Music</channel>
-    <channel lang="it" xmltv_id="NationalGeographicWildItalyPlus1.it" site_id="DTH#8813">National Geographic Wild Italia +1</channel>
     <channel lang="it" xmltv_id="NationalGeographicItaly.it" site_id="DTH#9098">National Geographic Italia</channel>
     <channel lang="it" xmltv_id="NationalGeographicItalyPlus1.it" site_id="DTH#125">National Geographic Italia +1</channel>
     <channel lang="it" xmltv_id="NationalGeographicWildItaly.it" site_id="DTH#9100">National Geographic Wild Italia</channel>
-    <channel lang="it" xmltv_id="NickJrItaly.it" site_id="DTH#461">Nick Jr Italia</channel>
-    <channel lang="it" xmltv_id="NickJrPlus1Italy.it" site_id="DTH#6701">Nick Jr Italia +1</channel>
+    <channel lang="it" xmltv_id="NationalGeographicWildItalyPlus1.it" site_id="DTH#8813">National Geographic Wild Italia +1</channel>
     <channel lang="it" xmltv_id="NickelodeonItaly.it" site_id="DTH#320">Nickelodeon Italia</channel>
     <channel lang="it" xmltv_id="NickelodeonPlus1Italy.it" site_id="DTH#6140">Nickelodeon Italia +1</channel>
+    <channel lang="it" xmltv_id="NickJrItaly.it" site_id="DTH#461">Nick Jr Italia</channel>
+    <channel lang="it" xmltv_id="NickJrPlus1Italy.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="Pesca.it" site_id="DTH#6220">Pesca</channel>
     <channel lang="it" xmltv_id="PopEconomy.it" site_id="DTH#11193">POP Economy</channel>
@@ -118,10 +117,10 @@
     <channel lang="it" xmltv_id="SkyCinemaSuspense.it" site_id="DTH#10515">Sky Cinema Suspense</channel>
     <channel lang="it" xmltv_id="SkyCinemaUno.it" site_id="DTH#9044">Sky Cinema Uno</channel>
     <channel lang="it" xmltv_id="SkyCinemaUnoPlus24.it" site_id="DTH#9037">Sky Cinema Uno +24</channel>
-    <channel lang="it" xmltv_id="SkyDocumentariesPlus1.it" site_id="DTH#11240">Sky Documentaries +1 HD</channel>
     <channel lang="it" xmltv_id="SkyDocumentariesHD.it" site_id="DTH#11239">Sky Documentaries HD</channel>
-    <channel lang="it" xmltv_id="SkyInvestigationPlus1.it" site_id="DTH#11238">Sky Investigation +1 HD</channel>
+    <channel lang="it" xmltv_id="SkyDocumentariesPlus1.it" site_id="DTH#11240">Sky Documentaries +1 HD</channel>
     <channel lang="it" xmltv_id="SkyInvestigationHD.it" site_id="DTH#11246">Sky Investigation HD</channel>
+    <channel lang="it" xmltv_id="SkyInvestigationPlus1.it" site_id="DTH#11238">Sky Investigation +1 HD</channel>
     <channel lang="it" xmltv_id="SkyMeteo24.it" site_id="DTH#321">Sky Meteo 24</channel>
     <channel lang="it" xmltv_id="SkyNatureHD.it" site_id="DTH#11242">Sky Nature HD</channel>
     <channel lang="it" xmltv_id="SkyNewsInternational.uk" site_id="DTH#445">Sky News International</channel>
@@ -151,10 +150,10 @@
     <channel lang="it" xmltv_id="SkyTG24.it" site_id="DTH#9117">Sky TG24 HD</channel>
     <channel lang="it" xmltv_id="SkyUno.it" site_id="DTH#9115">Sky Uno</channel>
     <channel lang="it" xmltv_id="SkyUnoPlus1.it" site_id="DTH#9114">Sky Uno +1</channel>
-    <channel lang="it" xmltv_id="SuperTennis.it" site_id="DTH#6000">Super Tennis</channel>
     <channel lang="it" xmltv_id="Super.it" site_id="DTH#6460">Super!</channel>
-    <channel lang="it" xmltv_id="TGNorba24.it" site_id="DTH#6481">TG Norba 24</channel>
+    <channel lang="it" xmltv_id="SuperTennis.it" site_id="DTH#6000">Super Tennis</channel>
     <channel lang="it" xmltv_id="TGCom24.it" site_id="DTH#10473">TgCom24 HD</channel>
+    <channel lang="it" xmltv_id="TGNorba24.it" site_id="DTH#6481">TG Norba 24</channel>
     <channel lang="it" xmltv_id="TopCrime.it" site_id="DTH#10468">Top Crime</channel>
     <channel lang="it" xmltv_id="TRMh24.it" site_id="DTH#9013">TRM h24</channel>
     <channel lang="it" xmltv_id="TV2000.va" site_id="DTH#7588">TV 2000</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index e5b96bf9..05621bea 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -33,7 +33,7 @@
     <channel lang="de" xmltv_id="CNBCEurope.uk" site_id="DE#deu#lgi-obolite-de-prod-master:CNBC_1">CNBC</channel>
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="DE#deu#lgi-obolite-de-prod-master:CNN">CNN</channel>
     <channel lang="de" xmltv_id="ComedyCentralGermany.de" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_24101">COMEDY CENTRAL</channel>
-    <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_25104">Crime + Investigation</channel>
+    <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.de" site_id="DE#deu#lgi-obolite-de-prod-master:SV_09999_25104">Crime + Investigation</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="DE#deu#lgi-obolite-de-prod-master:Das_Erste">Das Erste</channel>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="DE#deu#lgi-obolite-de-prod-master:DELUXE_MUSIC">DELUXE MUSIC</channel>
     <channel lang="de" xmltv_id="DeutschesMusikFernsehen.de" site_id="DE#deu#lgi-obolite-de-prod-master:Deutsches_Musikfernsehen">Deutsches Musik Fernsehen</channel>
diff --git a/sites/horizon.tv/horizon.tv_sk.channels.xml b/sites/horizon.tv/horizon.tv_sk.channels.xml
index 4a12e1a5..e377b4e6 100644
--- a/sites/horizon.tv/horizon.tv_sk.channels.xml
+++ b/sites/horizon.tv/horizon.tv_sk.channels.xml
@@ -2,7 +2,7 @@
 <site site="horizon.tv">
   <channels>
     <channel lang="sk" xmltv_id="24HD.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10193">RTVS 24 HD</channel>
-    <channel lang="sk" xmltv_id="AMCHDSlovakia.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10024">AMC HD</channel>
+    <channel lang="sk" xmltv_id="AMCCEE.cz" site_id="SK#slk#lgi-obolite-sk-prod-master:10024">AMC HD</channel>
     <channel lang="sk" xmltv_id="AnimalPlanetHDSlovakia.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10049">Animal Planet HD</channel>
     <channel lang="sk" xmltv_id="ATV.hu" site_id="SK#slk#lgi-obolite-sk-prod-master:10147">Magyar ATV</channel>
     <channel lang="sk" xmltv_id="AutoMotorundSport.de" site_id="SK#slk#lgi-obolite-sk-prod-master:10077">Auto Motor Sport</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 923ca262..96db1841 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
@@ -15,7 +15,7 @@
     <channel lang="cz" xmltv_id="AlJazeeraBalkans.qa" site_id="Al+Jazeera+Balkans">Aljazeera Balkans</channel>
     <channel lang="cz" xmltv_id="AlJazeeraChannel.qa" site_id="Aljazeera+%28Arabic%29">Aljazeera Channel</channel>
     <channel lang="cz" xmltv_id="AlJazeeraEnglish.qa" site_id="Al+Jazeera">Aljazeera English</channel>
-    <channel lang="cz" xmltv_id="AMCCzechRepublic.cz" site_id="AMC">AMC Cesko</channel>
+    <channel lang="cz" xmltv_id="AMCCEE.cz" site_id="AMC">AMC Cesko</channel>
     <channel lang="cz" xmltv_id="AnimalPlanetCzechRepublic.cz" site_id="AnimalPlanet">Animal Planet</channel>
     <channel lang="cz" xmltv_id="AnimalPlanetUK.uk" site_id="AnimalPlanet+UK">Animal Planet UK</channel>
     <channel lang="cz" xmltv_id="AnixeHDSerie.de" site_id="ANIXE+HD">Anixe HD Serie</channel>
@@ -77,7 +77,7 @@
     <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="CrimePlusInvestigationCZ.us" site_id="Crime+and+Investigation">Crime + Investigation CZ</channel>
+    <channel lang="cz" xmltv_id="CrimePlusInvestigationEurope.de" site_id="Crime+and+Investigation">Crime + Investigation</channel>
     <channel lang="cz" xmltv_id="CrimePlusInvestigationUK.uk" site_id="Crime+and+Investigation+UK">Crime + Investigation UK</channel>
     <channel lang="cz" xmltv_id="CSFilm.cz" site_id="CS+Film">CS Film</channel>
     <channel lang="cz" xmltv_id="CSHistory.cz" site_id="CS+History">CS History</channel>
diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index 891af2c8..c5f3d402 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="de" xmltv_id="CartoonNetworkGermany.de" site_id="Cartoon_Network_HD">Cartoon Network</channel>
     <channel lang="de" xmltv_id="ClubMTVEurope.uk" site_id="MTV_Dance">Club MTV</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="CrimePlusInvestigationGermany.de" site_id="A_E_HD">Crime + Investigation</channel>
     <channel lang="de" xmltv_id="DMAXGermany.de" site_id="DMAX_HD">DMAX Austria</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>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index 6506cb9f..62182674 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -37,7 +37,7 @@
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="399">CNN International</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="CrimePlusInvestigationGermany.de" 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>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="25">DELUXE MUSIC</channel>
diff --git a/sites/melita.com/melita.com_mt.channels.xml b/sites/melita.com/melita.com_mt.channels.xml
index 01715d11..84472f98 100644
--- a/sites/melita.com/melita.com_mt.channels.xml
+++ b/sites/melita.com/melita.com_mt.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="en" xmltv_id="AlJazeeraChannel.qa" site_id="786fa95a-4988-4c02-8daa-6d352cc31073">Al Jazeera Arabic</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="6981b50c-5b06-4a9e-891e-1c1e979be554">Al Jazeera English</channel>
-    <channel lang="en" xmltv_id="AMCHDHungary.hu" site_id="ec88d11a-46e7-4182-a7c9-167e97f927f0">AMC HD</channel>
+    <channel lang="en" xmltv_id="AMCMalta.es" site_id="ec88d11a-46e7-4182-a7c9-167e97f927f0">AMC HD</channel>
     <channel lang="en" xmltv_id="AnimalPlanetAfrica.za" site_id="100b35e6-bd16-40c9-bde9-32184e3ab560">Animal Planet HD</channel>
     <channel lang="en" xmltv_id="BabyTV.uk" site_id="0bf046ac-c11d-47ba-a5de-bddba08820f8">Baby TV</channel>
     <channel lang="en" xmltv_id="BBCEarthGreece.gr" site_id="8de17b4d-1798-402f-927e-cac7e1d38103">BBC Earth HD</channel>
diff --git a/sites/meo.pt/meo.pt_pt.channels.xml b/sites/meo.pt/meo.pt_pt.channels.xml
index 1654fc34..b4cc4be3 100644
--- a/sites/meo.pt/meo.pt_pt.channels.xml
+++ b/sites/meo.pt/meo.pt_pt.channels.xml
@@ -5,7 +5,7 @@
     <channel lang="pt" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="pt" xmltv_id="ABolaTV.pt" site_id="ABOLA">A Bola TV</channel>
     <channel lang="pt" xmltv_id="ADVNCE.pt" site_id="ADVNCE">ADVNCE</channel>
-    <channel lang="pt" xmltv_id="AMCPortugal.pt" site_id="AMC">AMC</channel>
+    <channel lang="pt" xmltv_id="AMCPortugal.es" site_id="AMC">AMC</channel>
     <channel lang="pt" xmltv_id="ARTEFrench.fr" site_id="ARTEHD">ARTE Français</channel>
     <channel lang="pt" xmltv_id="ARTVCanalParlamento.pt" site_id="ARTV">AR TV Canal Parlamento</channel>
     <channel lang="pt" xmltv_id="AXNMovies.pt" site_id="AXNM">AXN Movies</channel>
@@ -25,7 +25,7 @@
     <channel lang="pt" xmltv_id="BabyTV.uk" site_id="BABYT">Baby TV</channel>
     <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="SLB">Benfica TV</channel>
     <channel lang="pt" xmltv_id="Biggs.pt" site_id="BIGGS">Biggs</channel>
-    <channel lang="pt" xmltv_id="BlazePortugal.pt" site_id="BLAZE">Blaze</channel>
+    <channel lang="pt" xmltv_id="BlazePortugal.es" site_id="BLAZE">Blaze</channel>
     <channel lang="pt" xmltv_id="BloombergTVEMEA.uk" site_id="BLOOM">Bloomberg TV</channel>
     <channel lang="pt" xmltv_id="BodySexHD.pt" site_id="BODYSEX">Body Sex HD</channel>
     <channel lang="pt" xmltv_id="BomSomTV.pt" site_id="BOMSOM">Bom Som TV</channel>
@@ -50,7 +50,6 @@
     <channel lang="pt" xmltv_id="CazayPesca.es" site_id="CAÇAP">Caza y Pesca</channel>
     <channel lang="pt" xmltv_id="CineMundo.pt" site_id="CINE">Cine Mundo</channel>
     <channel lang="pt" xmltv_id="ClubbingTV.fr" site_id="CLUBB">Clubbing TV</channel>
-    <channel lang="pt" xmltv_id="CrimePlusInvestigationPortugal.pt" site_id="CI">Crime + Investigation</channel>
     <channel lang="pt" xmltv_id="CubavisionInternacional.cu" site_id="CUBAV">Cubavisión Internacional</channel>
     <channel lang="pt" xmltv_id="DasErste.de" site_id="ARD">Das Erste</channel>
     <channel lang="pt" xmltv_id="Decasa.es" site_id="DECASA">Decasa</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index 3f19a460..819eb41b 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="es" xmltv_id="247CanaldeNoticias.ar" site_id="ar#24-7-canal-de-noticias">24/7 Canal de Noticias</channel>
     <channel lang="es" xmltv_id="A24.ar" site_id="ar#america-24">A24</channel>
     <channel lang="es" xmltv_id="AESouth.us" site_id="ar#a-e-mundo">A&amp;E Mundo</channel>
-    <channel lang="es" xmltv_id="AMCSouth.us" site_id="ar#amc">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="ar#amc">AMC</channel>
     <channel lang="es" xmltv_id="AmericaSports.ar" site_id="ar#america-sports">América Sports</channel>
     <channel lang="es" xmltv_id="AmericaTV.ar" site_id="ar#america-2-capital">América TV</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="ar#animal-planet">Animal Planet</channel>
diff --git a/sites/mi.tv/mi.tv_cl.channels.xml b/sites/mi.tv/mi.tv_cl.channels.xml
index b74b45f9..9caf74ed 100644
--- a/sites/mi.tv/mi.tv_cl.channels.xml
+++ b/sites/mi.tv/mi.tv_cl.channels.xml
@@ -3,7 +3,7 @@
   <channels>
     <channel lang="es" xmltv_id="13C.cl" site_id="cl#canal-13-c">13C</channel>
     <channel lang="es" xmltv_id="24Horas.cl" site_id="cl#tvn-24-h">24 Horas</channel>
-    <channel lang="es" xmltv_id="AMCPanregional.us" site_id="cl#amc">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="cl#amc">AMC</channel>
     <channel lang="es" xmltv_id="AmericaSports.ar" site_id="cl#america-sports">America Sports</channel>
     <channel lang="es" xmltv_id="ARTV.cl" site_id="cl#artv">ARTV</channel>
     <channel lang="es" xmltv_id="AzCinema.mx" site_id="cl#az-cinema">Az Cinema</channel>
diff --git a/sites/mi.tv/mi.tv_mx.channels.xml b/sites/mi.tv/mi.tv_mx.channels.xml
index 267ac426..bd3bd409 100644
--- a/sites/mi.tv/mi.tv_mx.channels.xml
+++ b/sites/mi.tv/mi.tv_mx.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="mi.tv">
   <channels>
-    <channel lang="es" xmltv_id="AMCMexico.mx" site_id="mx#amc">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="mx#amc">AMC</channel>
     <channel lang="es" xmltv_id="Azteca7.mx" site_id="mx#azteca-7">Azteca 7</channel>
     <channel lang="es" xmltv_id="BoomerangMexico.mx" site_id="mx#boomerang-cartoon">Boomerang</channel>
     <channel lang="es" xmltv_id="Canal22MetropolitanayNacional.mx" site_id="mx#canal-22-conaculta">Canal 22 Metropolitana y Nacional</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index 273f889c..ec4784b4 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="en" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
-    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation Asia</channel>
+    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation Asia</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel Southeast Asia</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
     <channel lang="en" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
diff --git a/sites/mncvision.id/mncvision.id_id-id.channels.xml b/sites/mncvision.id/mncvision.id_id-id.channels.xml
index b7275afe..46312ab9 100644
--- a/sites/mncvision.id/mncvision.id_id-id.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-id.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="id" xmltv_id="CNA.sg" site_id="330">CNA</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="337">CNBC</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN</channel>
-    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="207">Crime + Investigation</channel>
+    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
     <channel lang="id" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
     <channel lang="id" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es.channels.xml b/sites/movistarplus.es/movistarplus.es_es.channels.xml
index 2c693402..01809cc9 100644
--- a/sites/movistarplus.es/movistarplus.es_es.channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es.channels.xml
@@ -21,7 +21,7 @@
     <channel lang="es" xmltv_id="BBCWorldNewsEurope.uk" site_id="BBC">BBC World News Europe</channel>
     <channel lang="es" xmltv_id="BeMad.es" site_id="BEMAD">Be Mad</channel>
     <channel lang="es" xmltv_id="Beteve.es" site_id="BTV">betevé</channel>
-    <channel lang="es" xmltv_id="BlazeSpain.us" site_id="BIOGRA">Blaze España</channel>
+    <channel lang="es" xmltv_id="BlazeSpain.es" site_id="BIOGRA">Blaze España</channel>
     <channel lang="es" xmltv_id="BloombergTVEMEA.uk" site_id="BL">Bloomberg TV Europe</channel>
     <channel lang="es" xmltv_id="BoingSpain.it" site_id="BOING">Boing España</channel>
     <channel lang="es" xmltv_id="BomCine.es" site_id="BOMCIN">Bom Cine</channel>
@@ -44,7 +44,6 @@
     <channel lang="es" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN International Europe</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.es" site_id="CYM">Crimen + Investigación</channel>
     <channel lang="es" xmltv_id="Cuatro.es" site_id="C4">Cuatro</channel>
     <channel lang="es" xmltv_id="CubavisionInternacional.cu" site_id="CUBAV">Cubavisión Internacional</channel>
     <channel lang="es" xmltv_id="Dark.es" site_id="DARK">Dark</channel>
diff --git a/sites/mtel.ba/mtel.ba_ba.channels.xml b/sites/mtel.ba/mtel.ba_ba.channels.xml
index a69d7e32..11f09cf8 100644
--- a/sites/mtel.ba/mtel.ba_ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba_ba.channels.xml
@@ -14,7 +14,7 @@
     <channel lang="bs" xmltv_id="AgroTV.rs" site_id="500#147">Agro TV</channel>
     <channel lang="bs" xmltv_id="AlJazeeraBalkans.qa" site_id="057#228">Aljazeera Balkans</channel>
     <channel lang="bs" xmltv_id="AmariTV.rs" site_id="640#370">Amari TV</channel>
-    <channel lang="bs" xmltv_id="AMCBosniaHerzegovina.ba" site_id="068#272">AMC</channel>
+    <channel lang="bs" xmltv_id="AMCBalkan.cz" site_id="068#272">AMC</channel>
     <channel lang="bs" xmltv_id="AnimalPlanetBosniaHerzegovina.ba" site_id="132#125">Animal Planet</channel>
     <channel lang="bs" xmltv_id="ArenaEsport.rs" site_id="049#406">Arena Esport</channel>
     <channel lang="bs" xmltv_id="ArenaFight.rs" site_id="085#434">Arena Fight</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index abada92b..0b8fdbbc 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="sr" xmltv_id="AgroTV.rs" site_id="126#147">Agro TV</channel>
     <channel lang="sr" xmltv_id="AlJazeeraBalkans.qa" site_id="654#25">Aljazeera Balkans</channel>
     <channel lang="sr" xmltv_id="AlternativnaTV.ba" site_id="657#530">Alternativna TV</channel>
-    <channel lang="sr" xmltv_id="AMCSerbia.rs" site_id="222#292">AMC</channel>
+    <channel lang="sr" xmltv_id="AMCBalkan.cz" site_id="222#292">AMC</channel>
     <channel lang="sr" xmltv_id="AnimalPlanetSerbia.rs" site_id="352#125">Animal Planet</channel>
     <channel lang="sr" xmltv_id="ArenaEsport.rs" site_id="162#724">Arena Esport</channel>
     <channel lang="sr" xmltv_id="ArenaFight.rs" site_id="161#766">Arena Fight</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index cb97c899..9044dba1 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -2,7 +2,7 @@
 <site site="musor.tv">
   <channels>
     <channel lang="hu" xmltv_id="7TV.hu" site_id="7TV">7.TV</channel>
-    <channel lang="hu" xmltv_id="AMCHDHungary.hu" site_id="AMC">AMC (HD)</channel>
+    <channel lang="hu" xmltv_id="AMCHungary.cz" site_id="AMC">AMC (HD)</channel>
     <channel lang="hu" xmltv_id="AnimalPlanetHDHungary.hu" site_id="ANIMAL">Animal Planet (HD)</channel>
     <channel lang="hu" xmltv_id="ApostolTV.hu" site_id="APOSTOL_TV">Apostol TV</channel>
     <channel lang="hu" xmltv_id="Arena4.hu" site_id="ARENA4">Arena 4 (HD)</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
index 822193a3..049d39bc 100644
--- a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
@@ -19,7 +19,7 @@
     <channel lang="en" xmltv_id="BBCParliament.uk" site_id="uk#69035446/bbc-parliament">BBC Parliament</channel>
     <channel lang="en" xmltv_id="BBCRedButton1.uk" site_id="uk#69035378/bbc-red-button-1">BBC Red Button 1</channel>
     <channel lang="en" xmltv_id="BBCTwo.uk" site_id="uk#69035372/bbc-2">BBC Two</channel>
-    <channel lang="en" xmltv_id="BlazeUK.uk" site_id="uk#4006438889/blaze">Blaze UK</channel>
+    <channel lang="en" xmltv_id="Blaze.uk" site_id="uk#4006438889/blaze">Blaze UK</channel>
     <channel lang="en" xmltv_id="BoxHits.uk" site_id="uk#3595458201/box-hits">Box Hits</channel>
     <channel lang="en" xmltv_id="BritAsiaTV.uk" site_id="uk#69041685/brit-asia-tv">Brit Asia TV</channel>
     <channel lang="en" xmltv_id="CBBC.uk" site_id="uk#69035514/cbbc">CBBC</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index f5467a6c..2467b88f 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -8,7 +8,7 @@
     <channel lang="ro" xmltv_id="AlephNews.ro" site_id="aleph-news">Aleph News</channel>
     <channel lang="ro" xmltv_id="AlfaOmegaTV.ro" site_id="alfa-omega-tv">Alfa Omega TV</channel>
     <channel lang="ro" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera">Aljazeera</channel>
-    <channel lang="ro" xmltv_id="AMCRomania.ro" site_id="amc">AMC</channel>
+    <channel lang="ro" xmltv_id="AMCRomania.cz" site_id="amc">AMC</channel>
     <channel lang="ro" xmltv_id="AnimalPlanetRomania.ro" site_id="animal-planet">Animal Planet</channel>
     <channel lang="ro" xmltv_id="Antena1.ro" site_id="antena-1">Antena 1</channel>
     <channel lang="ro" xmltv_id="Antena3.ro" site_id="antena-3">Antena 3</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 3c9d58f1..20d23710 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -12,7 +12,7 @@
     <channel lang="pl" xmltv_id="AdventureTV.pl" site_id="adventure-303">Adventure</channel>
     <channel lang="pl" xmltv_id="AleKinoPlus.pl" site_id="ale-kino-319">Ale Kino +</channel>
     <channel lang="pl" xmltv_id="AlJazeeraEnglish.qa" site_id="al-jazeera-hd-609">Aljazeera English</channel>
-    <channel lang="pl" xmltv_id="AMCPoland.pl" site_id="mgm-333">AMC Polska</channel>
+    <channel lang="pl" xmltv_id="AMCPoland.uk" site_id="mgm-333">AMC Polska</channel>
     <channel lang="pl" xmltv_id="AnimalPlanetPoland.pl" site_id="animal-planet-hd-284">Animal Planet Polska</channel>
     <channel lang="pl" xmltv_id="ARDalpha.de" site_id="ard-alpha-252">ARD Alpha</channel>
     <channel lang="pl" xmltv_id="ArirangWorld.kr" site_id="arirang-tv-30">Arirang World</channel>
@@ -64,7 +64,7 @@
     <channel lang="pl" xmltv_id="CNBCEurope.uk" 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.pl" site_id="comedy-central-63">Comedy Central Polska</channel>
-    <channel lang="pl" xmltv_id="CrimePlusInvestigationPolsat.pl" site_id="ci-polsat-257">Crime + Investigation Polsat</channel>
+    <channel lang="pl" xmltv_id="CrimePlusInvestigationPolsat.de" 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>
     <channel lang="pl" xmltv_id="DasErste.de" site_id="das-erste-350">Das Erste</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 99dcc28e..ab2d4aa3 100644
--- a/sites/siba.com.co/siba.com.co_co.channels.xml
+++ b/sites/siba.com.co/siba.com.co_co.channels.xml
@@ -2,7 +2,7 @@
 <site site="siba.com.co">
   <channels>
     <channel lang="es" xmltv_id="AEChile.cl" site_id="380">A&amp;E Chile</channel>
-    <channel lang="es" xmltv_id="AMCColombia.co" site_id="532">AMC</channel>
+    <channel lang="es" xmltv_id="AMCLatinAmerica.us" site_id="532">AMC</channel>
     <channel lang="es" xmltv_id="AnimalPlanetLatinAmerica.us" site_id="382">Animal Planet</channel>
     <channel lang="es" xmltv_id="AXNAndes.us" site_id="384">AXN</channel>
     <!-- <channel lang="es" xmltv_id="BrazzersTVXX.us" site_id="564">Brazzers TV XX</channel> -->
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index 52f43c6e..f4f526d2 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -52,7 +52,7 @@
     <channel lang="en" xmltv_id="BBCTwoWales.uk" site_id="2015">BBC Two Wales</channel>
     <channel lang="en" xmltv_id="BBCTwoWalesHD.uk" site_id="3015">BBC Two Wal HD</channel>
     <channel lang="en" xmltv_id="BestDirect.uk" site_id="4100">Best Direct</channel>
-    <channel lang="en" xmltv_id="BlazeUK.uk" site_id="1065">Blaze UK</channel>
+    <channel lang="en" xmltv_id="Blaze.uk" site_id="1065">Blaze UK</channel>
     <channel lang="en" xmltv_id="BoomerangUK.uk" site_id="5609">Boomerang</channel>
     <channel lang="en" xmltv_id="BoomerangUKPlus1.uk" site_id="5603">Boomerang+1</channel>
     <channel lang="en" xmltv_id="BoxHits.uk" site_id="1350">Box Hits</channel>
diff --git a/sites/sky.de/sky.de_de.channels.xml b/sites/sky.de/sky.de_de.channels.xml
index eb84ff10..9567d29a 100644
--- a/sites/sky.de/sky.de_de.channels.xml
+++ b/sites/sky.de/sky.de_de.channels.xml
@@ -6,7 +6,7 @@
     <channel lang="de" xmltv_id="BoomerangGermany.de" site_id="761">Boomerang Deutschland</channel>
     <channel lang="de" xmltv_id="CartoonNetworkGermany.de" site_id="95">Cartoon Network Deutschland</channel>
     <channel lang="de" xmltv_id="ClassicaHD.it" site_id="99">Classica HD</channel>
-    <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.us" site_id="451">Crime + Investigation Deutschland</channel>
+    <channel lang="de" xmltv_id="CrimePlusInvestigationGermany.de" site_id="451">Crime + Investigation Deutschland</channel>
     <channel lang="de" xmltv_id="DAZN1Germany.uk" site_id="659">DAZN 1 Deutschland</channel>
     <channel lang="de" xmltv_id="DAZN2Germany.uk" site_id="900">DAZN 2 Deutschland</channel>
     <channel lang="de" xmltv_id="DiscoveryChannelGermany.de" site_id="83">Discovery Channel Deutschland</channel>
diff --git a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
index 8bc4ce5e..37724af7 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
+++ b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
@@ -41,7 +41,7 @@
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="711">CNN HD</channel>
     <channel lang="en" xmltv_id="Colors.in" site_id="128">COLORS</channel>
     <channel lang="en" xmltv_id="ColorsTamil.in" site_id="132">COLORS Tamil HD</channel>
-    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="403">Crime + Investigation HD</channel>
+    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="403">Crime + Investigation HD</channel>
     <channel lang="en" xmltv_id="CTiTV.tw" site_id="827">CTI TV HD</channel>
     <channel lang="en" xmltv_id="CuriosityChannel.us" site_id="422">CuriosityStream HD</channel>
     <channel lang="en" xmltv_id="DragonTVInternational.cn" site_id="832">Dragon TV</channel>
diff --git a/sites/startimestv.com/startimestv.com_mz.channels.xml b/sites/startimestv.com/startimestv.com_mz.channels.xml
index 171d2ec6..1dbe196d 100644
--- a/sites/startimestv.com/startimestv.com_mz.channels.xml
+++ b/sites/startimestv.com/startimestv.com_mz.channels.xml
@@ -2,7 +2,7 @@
 <site site="startimestv.com">
   <channels>
     <channel lang="en" xmltv_id="AMCMovies.uk" site_id="1023149121">AMC MOVIES</channel>
-    <channel lang="en" xmltv_id="AMCPortugal.pt" site_id="595">AMC P</channel>
+    <channel lang="en" xmltv_id="AMCPortugal.es" site_id="595">AMC P</channel>
     <channel lang="en" xmltv_id="AforevoTV.ng" site_id="615">AFOREVO TV</channel>
     <channel lang="en" xmltv_id="Africanews.cg" site_id="549">AFRICA NEWS</channel>
     <channel lang="en" xmltv_id="AfroMusicChannel.pt" site_id="514">Afro Music</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index e5af09b5..2d33ac24 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="en" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="en" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
-    <channel lang="en" xmltv_id="AMCRussia.ru" site_id="829">AMC</channel>
+    <channel lang="en" xmltv_id="AMCBaltics.cz" site_id="829">AMC</channel>
     <channel lang="en" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
     <channel lang="en" xmltv_id="ARTEFrench.fr" site_id="24">ARTE Français</channel>
     <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index ab3c24c2..1b5474c8 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="et" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
     <channel lang="et" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="et" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
-    <channel lang="et" xmltv_id="AMCRussia.ru" site_id="829">AMC</channel>
+    <channel lang="et" xmltv_id="AMCBaltics.cz" site_id="829">AMC</channel>
     <channel lang="et" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet</channel>
     <channel lang="et" xmltv_id="ARTEFrench.fr" site_id="24">ARTE</channel>
     <channel lang="et" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index d0ec54d5..90e8ccb4 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="ru" xmltv_id="1Plus2.lv" site_id="1341">1+2</channel>
     <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="89">Aljazeera English</channel>
     <channel lang="ru" xmltv_id="AloTV.ee" site_id="157">Alo TV</channel>
-    <channel lang="ru" xmltv_id="AMCRussia.ru" site_id="829">AMC Russia</channel>
+    <channel lang="ru" xmltv_id="AMCBaltics.cz" site_id="829">AMC Russia</channel>
     <channel lang="ru" xmltv_id="AnimalPlanetRussia.ru" site_id="31">Animal Planet Rossiya</channel>
     <channel lang="ru" xmltv_id="ARTEFrench.fr" site_id="24">ARTE Français</channel>
     <channel lang="ru" xmltv_id="BBCEarthAsia.uk" site_id="1264">BBC Earth Asia</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 7e59dac4..78b84fb3 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -27,7 +27,7 @@
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="CNBC">CNBC Asia</channel>
     <channel lang="id" xmltv_id="CNNIndonesia.id" site_id="CNI">CNN Indonesia HD</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
-    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="CI">Crime &amp; Investigation HD</channel>
+    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="CI">Crime &amp; Investigation HD</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="DVL">Da Vinci</channel>
     <channel lang="id" xmltv_id="DAAITV.id" site_id="DAAI">DAAI TV</channel>
     <channel lang="id" xmltv_id="DuckTV.sk" site_id="DUCK">Duck TV</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index f04954da..6df1c73a 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -46,7 +46,7 @@
     <channel lang="de" xmltv_id="BRFernsehenSud.de" site_id="55">Bayerisches Fernsehen Süd</channel>
     <channel lang="de" xmltv_id="CartoonNetworkGermany.de" site_id="83">Cartoon Network Deutschland</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="CrimePlusInvestigationGermany.de" 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>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="17">Deluxe Music</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 dea676eb..ae3f6fba 100644
--- a/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg_bg.channels.xml
@@ -4,7 +4,7 @@
     <channel lang="bg" xmltv_id="24KitchenBulgaria.bg" site_id="190">24 Kitchen</channel>
     <channel lang="bg" xmltv_id="78TV.bg" site_id="372">7/8 TV</channel>
     <channel lang="bg" xmltv_id="AlfaTV.bg" site_id="359">Alfa TV</channel>
-    <channel lang="bg" xmltv_id="AMCBulgaria.bg" site_id="124">AMC</channel>
+    <channel lang="bg" xmltv_id="AMCBulgaria.cz" site_id="124">AMC</channel>
     <channel lang="bg" xmltv_id="AnimalPlanetBulgaria.bg" site_id="65">Animal Planet</channel>
     <channel lang="bg" xmltv_id="AXNBlack.us" site_id="264">AXN Black</channel>
     <channel lang="bg" xmltv_id="AXNEurope.gr" site_id="64">AXN</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 94b03ed8..cc214e29 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="th" xmltv_id="Channel8.th" site_id="ch8">Thai Channel 8</channel>
     <channel lang="th" xmltv_id="CNBCAsia.sg" site_id="cnbc">CNBC</channel>
     <channel lang="th" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="cnn-hd">CNN HD</channel>
-    <channel lang="th" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crime-investigation">Crime + Investigation</channel>
+    <channel lang="th" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="crime-investigation">Crime + Investigation</channel>
     <channel lang="th" xmltv_id="DiscoveryAsiaThailand.th" site_id="discoveryasia">Discovery Asia</channel>
     <channel lang="th" xmltv_id="DiscoveryChannelThailand.th" site_id="discoverychannel">Discovery Channel</channel>
     <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="dreamworks-hd">DreamWorks TV HD</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 f3a8a355..f4138e40 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -10,7 +10,6 @@
     <channel lang="ru" xmltv_id="A1.ru" site_id="213#a1-237">A1</channel>
     <channel lang="ru" xmltv_id="A2.ru" site_id="213#a2-89">A2</channel>
     <channel lang="ru" xmltv_id="AjaraTV.ge" site_id="213#ajara-tv-682">Ajara TV</channel>
-    <channel lang="ru" xmltv_id="AMCRussia.ru" site_id="213#amc-615">AMC Russia</channel>
     <channel lang="ru" xmltv_id="AmediaHit.ru" site_id="213#amedia-hit-239">Amedia Hit</channel>
     <channel lang="ru" xmltv_id="AmediaPremium.ru" site_id="213#amedia-premium-hd-238">Amedia Premium</channel>
     <channel lang="ru" xmltv_id="AnekdotTV.ru" site_id="213#anekdot-tv-85">Anekdot TV</channel>
diff --git a/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml b/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
index 61c5f80e..da61eb8a 100644
--- a/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
+++ b/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tv.yettel.hu">
   <channels>
-    <channel lang="hu" xmltv_id="AMCHungary.hu" site_id="LCH16">AMC</channel>
+    <channel lang="hu" xmltv_id="AMCHungary.cz" site_id="LCH16">AMC</channel>
     <channel lang="hu" xmltv_id="AnimalPlanetHungary.hu" site_id="LCH136">Animal Planet</channel>
     <channel lang="hu" xmltv_id="Arena4.hu" site_id="LCH179">Arena4</channel>
     <channel lang="hu" xmltv_id="ATV.hu" site_id="LCH182">ATV</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 753e1b03..7b43828a 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
@@ -8,7 +8,7 @@
     <channel lang="sl" xmltv_id="AgroTV.rs" site_id="1000686">Agro TV</channel>
     <channel lang="sl" xmltv_id="AlJazeeraBalkans.qa" site_id="1000180">Al Jazeera Balk</channel>
     <channel lang="sl" xmltv_id="Alsat.mk" site_id="1000219">Alsat-M</channel>
-    <channel lang="sl" xmltv_id="AMCHDSlovenia.si" site_id="1000523">AMC HD</channel>
+    <channel lang="sl" xmltv_id="AMCSlovenia.cz" site_id="1000523">AMC HD</channel>
     <channel lang="sl" xmltv_id="AnixeHDSerie.de" site_id="1000057">Anixe HD Serie</channel>
     <channel lang="sl" xmltv_id="ArenaEsport.rs" site_id="1000683">Arena Esport</channel>
     <channel lang="sl" xmltv_id="ArenaFight.rs" site_id="1000777">Arena Fight</channel>
diff --git a/sites/tvgid.ua/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
index 21e05fec..339cde60 100644
--- a/sites/tvgid.ua/tvgid.ua_ua.channels.xml
+++ b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
@@ -8,7 +8,6 @@
     <channel lang="uk" xmltv_id="5Kanal.ua" site_id="5kanal">5 Kanal</channel>
     <channel lang="uk" xmltv_id="8Kanal.ua" site_id="8_kanal">8 Kanal</channel>
     <channel lang="uk" xmltv_id="AjaraTV.ge" site_id="ajara_tv">Ajara TV</channel>
-    <channel lang="uk" xmltv_id="AMCRussia.ru" site_id="amc">AMC Russia</channel>
     <channel lang="uk" xmltv_id="AnimalPlanetRussia.ru" site_id="animal_planet">Animal Planet</channel>
     <channel lang="uk" xmltv_id="BBCWorldNewsEurope.uk" site_id="bbc_world">BBC World News</channel>
     <channel lang="uk" xmltv_id="Belarus24.by" site_id="belarus_24">Belarus 24</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
index 06ce47c5..b8db422d 100644
--- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tvmusor.hu">
   <channels>
-    <channel lang="hu" xmltv_id="AMCHungary.hu" site_id="139">AMC</channel>
+    <channel lang="hu" xmltv_id="AMCHungary.cz" site_id="139">AMC</channel>
     <channel lang="hu" xmltv_id="AnimalPlanetHungary.hu" site_id="231">Animal Planet</channel>
     <channel lang="hu" xmltv_id="ATV.hu" site_id="15">ATV</channel>
     <channel lang="hu" xmltv_id="AXNHungary.hu" site_id="42">AXN</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_hu.channels.xml b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
index 7480df75..94d41acd 100644
--- a/sites/tvprofil.com/tvprofil.com_hu.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tvprofil.com">
   <channels>
-    <channel lang="hr" xmltv_id="AMCHungary.hu" site_id="hu/tvmusor#amc-hu">AMC Magyarország</channel>
+    <channel lang="hr" xmltv_id="AMCHungary.cz" site_id="hu/tvmusor#amc-hu">AMC Magyarország</channel>
     <channel lang="hr" xmltv_id="ApostolTV.hu" site_id="hu/tvmusor#apostol-tv">Apostol TV</channel>
     <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>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 07c6f881..966ae528 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -101,7 +101,7 @@
     <channel lang="en" xmltv_id="BigTenNetworkOverflow2.us" site_id="71198">Big Ten Network Overflow 2</channel>
     <channel lang="en" xmltv_id="BigTenNetworkOverflow3.us" site_id="71200">Big Ten Network Overflow 3</channel>
     <channel lang="en" xmltv_id="BigTenNetworkOverflow4.us" site_id="71202">Big Ten Network Overflow 4</channel>
-    <channel lang="en" xmltv_id="Blaze.us" site_id="11549">Blaze</channel>
+    <channel lang="en" xmltv_id="Blaze.uk" site_id="11549">Blaze</channel>
     <channel lang="en" xmltv_id="BloombergTelevision.us" site_id="71799">Bloomberg Television</channel>
     <channel lang="en" xmltv_id="Boomerang.us" site_id="21883">Boomerang</channel>
     <channel lang="en" xmltv_id="Bounce.us" site_id="73067">Bounce</channel>
diff --git a/sites/useetv.com/useetv.com_id.channels.xml b/sites/useetv.com/useetv.com_id.channels.xml
index e132f3a7..07f1f87e 100644
--- a/sites/useetv.com/useetv.com_id.channels.xml
+++ b/sites/useetv.com/useetv.com_id.channels.xml
@@ -120,7 +120,7 @@
     <channel lang="id" xmltv_id="NationalGeographicWildHDIndonesia.id" site_id="natgeowild">Nat Geo Wild</channel>
     <channel lang="id" xmltv_id="NationalGeographicWildIndonesia.id" site_id="natgeowild">Nat Geo Wild</channel>
     <channel lang="id" xmltv_id="TechStorm.sg" site_id="techstorm">Tech Storm</channel>
-    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crimeinvestigation">Crime Investigation</channel>
+    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="crimeinvestigation">Crime Investigation</channel>
     <channel lang="id" xmltv_id="LinguaChannel.id" site_id="lingua">Lingua</channel>
     <!-- <channel lang="id" xmltv_id="PandaTV.id" site_id="pandatv">Panda TV</channel> -->
     <channel lang="id" xmltv_id="AsianFoodNetwork.sg" site_id="afc">Asian Food Network</channel>
diff --git a/sites/virginmedia.com/virginmedia.com_uk.channels.xml b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
index c9e73539..6915ece3 100644
--- a/sites/virginmedia.com/virginmedia.com_uk.channels.xml
+++ b/sites/virginmedia.com/virginmedia.com_uk.channels.xml
@@ -27,7 +27,7 @@
     <channel lang="en" xmltv_id="BBCRedButton1.uk" site_id="1919">BBC Red Button 1</channel>
     <channel lang="en" xmltv_id="BBCThree.uk" site_id="2240">BBC Three</channel>
     <channel lang="en" xmltv_id="BBCTwo.uk" site_id="2007">BBC Two</channel>
-    <channel lang="en" xmltv_id="BlazeUK.uk" site_id="1910">Blaze UK</channel>
+    <channel lang="en" xmltv_id="Blaze.uk" site_id="1910">Blaze UK</channel>
     <channel lang="en" xmltv_id="BloombergTVEMEA.uk" site_id="339">Bloomberg TV Europe</channel>
     <channel lang="en" xmltv_id="BoomerangUK.uk" site_id="405">Boomerang</channel>
     <channel lang="en" xmltv_id="BoxHits.uk" site_id="268">Box Hits</channel>
diff --git a/sites/vivacom.bg/vivacom.bg_bg.channels.xml b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
index 2dcf7c11..10e8c980 100644
--- a/sites/vivacom.bg/vivacom.bg_bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
@@ -6,7 +6,7 @@
     <channel lang="bg" xmltv_id="78TV.bg" site_id="23#7/8 TV  ">7/8 TV</channel>
     <channel lang="bg" xmltv_id="AgroTV.bg" site_id="9#Агро ТВ">Agro TV</channel>
     <channel lang="bg" xmltv_id="AlfaTV.bg" site_id="9#Алфа ТВ">Alfa TV</channel>
-    <channel lang="bg" xmltv_id="AMCBulgaria.bg" site_id="7#AMC">AMC</channel>
+    <channel lang="bg" xmltv_id="AMCBulgaria.cz" site_id="7#AMC">AMC</channel>
     <channel lang="bg" xmltv_id="AnimalPlanetBulgaria.bg" site_id="19#Animal Planet">Animal Planet</channel>
     <channel lang="de" xmltv_id="AutoMotorundSport.de" site_id="4#Auto Motor Sport">Auto Motor und Sport</channel>
     <channel lang="bg" xmltv_id="AXNBlack.us" site_id="7#AXN Black">AXN Black</channel>
diff --git a/sites/zap.co.ao/zap.co.ao_ao.channels.xml b/sites/zap.co.ao/zap.co.ao_ao.channels.xml
index 3e3db974..ac2893b3 100644
--- a/sites/zap.co.ao/zap.co.ao_ao.channels.xml
+++ b/sites/zap.co.ao/zap.co.ao_ao.channels.xml
@@ -17,7 +17,7 @@
     <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="36">Benfica TV</channel>
     <channel lang="pt" xmltv_id="Biggs.pt" site_id="47">Biggs</channel>
     <channel lang="pt" xmltv_id="Blast.ao" site_id="120">Blast</channel>
-    <channel lang="pt" xmltv_id="BlazePortugal.pt" site_id="99">Blaze Portugal</channel>
+    <channel lang="pt" xmltv_id="BlazePortugal.es" site_id="99">Blaze Portugal</channel>
     <channel lang="pt" xmltv_id="BloombergTVAfrica.us" site_id="111">Bloomberg TV Africa</channel>
     <channel lang="pt" xmltv_id="CCTV4Europe.cn" site_id="114">CCTV 4 Europe</channel>
     <channel lang="pt" xmltv_id="CMTV.pt" site_id="32">CM TV</channel>