diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml
index 983b93a7..c118b2a0 100644
--- a/sites/allente.se/allente.se_dk.channels.xml
+++ b/sites/allente.se/allente.se_dk.channels.xml
@@ -40,7 +40,7 @@
   <channel site="allente.se" lang="da" xmltv_id="TV2News.dk" site_id="dk#0190">TV 2 News</channel>
   <channel site="allente.se" lang="da" xmltv_id="TV2Sport.dk" site_id="dk#454">TV 2 Sport</channel>
   <channel site="allente.se" lang="da" xmltv_id="TV2Zulu.dk" site_id="dk#0209">TV 2 Zulu</channel>
-  <channel site="allente.se" lang="da" xmltv_id="TV3Danmark.dk" site_id="dk#0359">TV 3 Danmark</channel>
+  <channel site="allente.se" lang="da" xmltv_id="TV3.dk" site_id="dk#0359">TV 3 Danmark</channel>
   <channel site="allente.se" lang="da" xmltv_id="TV3Max.dk" site_id="dk#0374">TV 3 Max</channel>
   <channel site="allente.se" lang="da" xmltv_id="TV3Plus.dk" site_id="dk#0248">TV3+</channel>
   <channel site="allente.se" lang="da" xmltv_id="TV3Puls.dk" site_id="dk#665">TV 3 Puls</channel>
diff --git a/sites/allente.se/allente.se_fi.channels.xml b/sites/allente.se/allente.se_fi.channels.xml
index 60150bfc..97c62cca 100644
--- a/sites/allente.se/allente.se_fi.channels.xml
+++ b/sites/allente.se/allente.se_fi.channels.xml
@@ -13,7 +13,7 @@
   <channel site="allente.se" lang="fi" xmltv_id="NationalGeographicWild.fi" site_id="fi#558">National Geographic Wild</channel>
   <channel site="allente.se" lang="fi" xmltv_id="NickJrScandinavia.nl" site_id="fi#0088">Nick Jr</channel>
   <channel site="allente.se" lang="fi" xmltv_id="TV3.se" site_id="fi#0290">TV 3 Sverige</channel>
-  <channel site="allente.se" lang="fi" xmltv_id="TV6Sweden.se" site_id="fi#0360">TV 6 Sverige</channel>
+  <channel site="allente.se" lang="fi" xmltv_id="TV6.se" site_id="fi#0360">TV 6 Sverige</channel>
   <channel site="allente.se" lang="fi" xmltv_id="VFilmAction.se" site_id="fi#0299">V Film Action</channel>
   <channel site="allente.se" lang="fi" xmltv_id="VFilmFamily.se" site_id="fi#0308">V Film Family</channel>
   <channel site="allente.se" lang="fi" xmltv_id="VFilmHits.se" site_id="fi#0322">V Film Hits</channel>
diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml
index d34514ef..9aa1ecf7 100644
--- a/sites/allente.se/allente.se_no.channels.xml
+++ b/sites/allente.se/allente.se_no.channels.xml
@@ -43,11 +43,11 @@
   <channel site="allente.se" lang="no" xmltv_id="TV2Sport2.no" site_id="no#0406">TV 2 Sport 2</channel>
   <channel site="allente.se" lang="no" xmltv_id="TV2SportPremium.no" site_id="no#0197">TV 2 Sport Premium</channel>
   <channel site="allente.se" lang="no" xmltv_id="TV2Zebra.no" site_id="no#0405">TV 2 Zebra</channel>
-  <channel site="allente.se" lang="no" xmltv_id="TV3Danmark.dk" site_id="no#0359">TV 3 Danmark</channel>
-  <channel site="allente.se" lang="no" xmltv_id="TV3Norway.no" site_id="no#0298">TV 3 Norge</channel>
+  <channel site="allente.se" lang="no" xmltv_id="TV3.dk" site_id="no#0359">TV 3 Danmark</channel>
+  <channel site="allente.se" lang="no" xmltv_id="TV3.no" site_id="no#0298">TV 3 Norge</channel>
   <channel site="allente.se" lang="no" xmltv_id="TV3.se" site_id="no#0222">TV 3 Sverige</channel>
-  <channel site="allente.se" lang="no" xmltv_id="TV6Norway.no" site_id="no#0206">TV 6 Norge</channel>
-  <channel site="allente.se" lang="no" xmltv_id="TV6Sweden.se" site_id="no#0360">TV 6 Sverige</channel>
+  <channel site="allente.se" lang="no" xmltv_id="TV6.no" site_id="no#0206">TV 6 Norge</channel>
+  <channel site="allente.se" lang="no" xmltv_id="TV6.se" site_id="no#0360">TV 6 Sverige</channel>
   <channel site="allente.se" lang="no" xmltv_id="TVNorge.no" site_id="no#534">TV Norge</channel>
   <channel site="allente.se" lang="no" xmltv_id="V4.no" site_id="no#0361">V 4</channel>
   <channel site="allente.se" lang="no" xmltv_id="VFilmAction.se" site_id="no#0299">V Film Action</channel>
diff --git a/sites/allente.se/allente.se_se.channels.xml b/sites/allente.se/allente.se_se.channels.xml
index 6efceca2..17851a22 100644
--- a/sites/allente.se/allente.se_se.channels.xml
+++ b/sites/allente.se/allente.se_se.channels.xml
@@ -84,8 +84,8 @@
   <channel site="allente.se" lang="sv" xmltv_id="TV4Fakta.se" site_id="se#0228">TV 4 Fakta</channel>
   <channel site="allente.se" lang="sv" xmltv_id="TV4Film.se" site_id="se#0229">TV 4 Film</channel>
   <channel site="allente.se" lang="sv" xmltv_id="TV4Guld.se" site_id="se#0230">TV 4 Guld</channel>
-  <channel site="allente.se" lang="sv" xmltv_id="TV6Sweden.se" site_id="se#0360">TV 6</channel>
-  <channel site="allente.se" lang="sv" xmltv_id="TV8Sweden.se" site_id="se#666">TV 8</channel>
+  <channel site="allente.se" lang="sv" xmltv_id="TV6.se" site_id="se#0360">TV 6</channel>
+  <channel site="allente.se" lang="sv" xmltv_id="TV8.se" site_id="se#666">TV 8</channel>
   <channel site="allente.se" lang="sv" xmltv_id="TV10.se" site_id="se#667">TV 10</channel>
   <channel site="allente.se" lang="sv" xmltv_id="TV12.se" site_id="se#664">TV 12</channel>
   <channel site="allente.se" lang="sv" xmltv_id="VFilmAction.se" site_id="se#0299">V Film Action</channel>
diff --git a/sites/cgates.lt/cgates.lt.channels.xml b/sites/cgates.lt/cgates.lt.channels.xml
index 944046db..b8fea329 100644
--- a/sites/cgates.lt/cgates.lt.channels.xml
+++ b/sites/cgates.lt/cgates.lt.channels.xml
@@ -52,7 +52,7 @@
   <channel site="cgates.lt" lang="en" xmltv_id="EpicDrama.se" site_id="epic-drama-hd">Epic Drama HD</channel>
   <channel site="cgates.lt" lang="en" xmltv_id="Eurochannel.uk" site_id="eurochannel">Eurochannel</channel>
   <channel site="cgates.lt" lang="en" xmltv_id="EuronewsRussian.fr" site_id="euronews-2">Euronews RU</channel>
-  <channel site="cgates.lt" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="extreme-sports">Extreme Sports</channel>
+  <channel site="cgates.lt" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports">Extreme Sports</channel>
   <channel site="cgates.lt" lang="en" xmltv_id="FashionTVEurope.fr" site_id="fashion-tv">Fashion TV</channel>
   <channel site="cgates.lt" lang="en" xmltv_id="FastFunBox.nl" site_id="fastfun-box-hd">Fast&amp;Fun Box HD</channel>
   <channel site="cgates.lt" lang="en" xmltv_id="FightSports.us" site_id="fight-sports-hd">Fight Sports HD</channel>
@@ -111,10 +111,10 @@
   <channel site="cgates.lt" lang="lt" xmltv_id="StarFamily.ru" site_id="star-family">Star Family</channel>
   <channel site="cgates.lt" lang="lt" xmltv_id="TiJi.ru" site_id="tiji">Tiji</channel>
   <channel site="cgates.lt" lang="lt" xmltv_id="TV1.lt" site_id="tv1-hd">TV1 HD</channel>
-  <channel site="cgates.lt" lang="lt" xmltv_id="TV3Lithuania.lt" site_id="tv3-hd">TV3 HD</channel>
-  <channel site="cgates.lt" lang="lt" xmltv_id="TV3PlusLatvia.lv" site_id="tv3-plus-hd">TV3 Plus HD</channel>
-  <channel site="cgates.lt" lang="lt" xmltv_id="TV6Lithuania.lt" site_id="tv6-hd">TV6 HD</channel>
-  <channel site="cgates.lt" lang="lt" xmltv_id="TV8Lithuania.lt" site_id="tv8-hd">TV8 HD</channel>
+  <channel site="cgates.lt" lang="lt" xmltv_id="TV3.lt" site_id="tv3-hd">TV3 HD</channel>
+  <channel site="cgates.lt" lang="lt" xmltv_id="TV3Plus.lv" site_id="tv3-plus-hd">TV3 Plus HD</channel>
+  <channel site="cgates.lt" lang="lt" xmltv_id="TV6.lt" site_id="tv6-hd">TV6 HD</channel>
+  <channel site="cgates.lt" lang="lt" xmltv_id="TV8.lt" site_id="tv8-hd">TV8 HD</channel>
   <channel site="cgates.lt" lang="lt" xmltv_id="Bolt.ua" site_id="bolt">Bolt</channel>
   <channel site="cgates.lt" lang="lt" xmltv_id="TVPInfo.pl" site_id="tvp-info">TVP Info</channel>
   <channel site="cgates.lt" lang="lt" xmltv_id="TVPPolonia.pl" site_id="tvp-polonia">TVP Polonia</channel>
diff --git a/sites/comteco.com.bo/comteco.com.bo.channels.xml b/sites/comteco.com.bo/comteco.com.bo.channels.xml
index f205f064..bc2519e4 100644
--- a/sites/comteco.com.bo/comteco.com.bo.channels.xml
+++ b/sites/comteco.com.bo/comteco.com.bo.channels.xml
@@ -17,7 +17,7 @@
   <channel site="comteco.com.bo" lang="es" xmltv_id="CaracolInternacional.co" site_id="Caracol">Caracol TV</channel>
   <channel site="comteco.com.bo" lang="es" xmltv_id="CartoonNetworkPacific.us" site_id="Cartoon Network">Cartoon Network</channel>
   <channel site="comteco.com.bo" lang="es" xmltv_id="CinecanalEast.us" site_id="CINECANAL">Cinecanal Este</channel>
-  <channel site="comteco.com.bo" lang="es" xmltv_id="CinemaxPanregional.us" site_id="Cinemax">Cinemax</channel>
+  <channel site="comteco.com.bo" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="Cinemax">Cinemax</channel>
   <channel site="comteco.com.bo" lang="es" xmltv_id="CNNInternationalLatinAmerica.us" site_id="CNN">CNN</channel>
   <channel site="comteco.com.bo" lang="es" xmltv_id="CubavisionInternacional.cu" site_id="Cuba Vision">Cubavisión</channel>
   <channel site="comteco.com.bo" lang="es" xmltv_id="DePeliculaLatinAmerica.mx" site_id="De Pelicula">De Película</channel>
diff --git a/sites/delta.nl/delta.nl.channels.xml b/sites/delta.nl/delta.nl.channels.xml
index 762d906a..b833256f 100644
--- a/sites/delta.nl/delta.nl.channels.xml
+++ b/sites/delta.nl/delta.nl.channels.xml
@@ -11,7 +11,7 @@
   <channel site="delta.nl" lang="en" xmltv_id="CGTN.cn" site_id="3125">CGTN</channel>
   <channel site="delta.nl" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="44">CNN International Europe</channel>
   <channel site="delta.nl" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="64">EuroNews English</channel>
-  <channel site="delta.nl" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="93">Extreme Sports Channel</channel>
+  <channel site="delta.nl" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="93">Extreme Sports Channel</channel>
   <channel site="delta.nl" lang="en" xmltv_id="FashionTVEurope.fr" site_id="3004">FashionTV Europe</channel>
   <channel site="delta.nl" lang="en" xmltv_id="MTV00s.uk" site_id="81">MTV 00s</channel>
   <channel site="delta.nl" lang="en" xmltv_id="MTV80s.uk" site_id="82">MTV 80s</channel>
diff --git a/sites/directv.com.ar/directv.com.ar.channels.xml b/sites/directv.com.ar/directv.com.ar.channels.xml
index 750f9ab9..d6694a2b 100644
--- a/sites/directv.com.ar/directv.com.ar.channels.xml
+++ b/sites/directv.com.ar/directv.com.ar.channels.xml
@@ -189,7 +189,7 @@
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="Canal26.ar" site_id="720#CA26HD">Canal 26 HD</channel> -->
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="CanaldelaCiudad.ar" site_id="127#CDLC">CANAL DE LA CIUDAD</channel> -->
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="CCTV4America.cn" site_id="791#CCTV">CCTV-4</channel> -->
-  <!-- <channel site="directv.com.ar" lang="es" xmltv_id="CinemaxSouth.us" site_id="509#CMAXHD">Cinemax HD (Sur)</channel> -->
+  <!-- <channel site="directv.com.ar" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="509#CMAXHD">Cinemax HD (Sur)</channel> -->
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="ConstruirTV.ar" site_id="729#CRTV">Construir TV</channel> -->
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="DeporTV.ar" site_id="656#DXTVHD">DeporTV HD</channel> -->
   <!-- <channel site="directv.com.ar" lang="es" xmltv_id="DHE.us" site_id="513#DHEHD">DHE HD</channel> -->
@@ -274,7 +274,7 @@
   <channel site="directv.com.ar" lang="es" xmltv_id="CineAr.ar" site_id="512#CNAR">CINE.AR (ARG)</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="CinecanalSouth.us" site_id="507#CC">Cinecanal (ARG)</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="CineLatino.mx" site_id="514#CL">Cinelatino</channel>
-  <channel site="directv.com.ar" lang="es" xmltv_id="CinemaxSouth.us" site_id="509#CMAX">Cinemax Sur</channel>
+  <channel site="directv.com.ar" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="509#CMAX">Cinemax Sur</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="CiudadMagazine.ar" site_id="236#MAGA">Magazine</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="CNNChile.cl" site_id="707#CNNC">CNN Chile</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="CNNenEspanol.us" site_id="704#CNNE">CNN en español</channel>
diff --git a/sites/directv.com.uy/directv.com.uy.channels.xml b/sites/directv.com.uy/directv.com.uy.channels.xml
index 34f9fa4f..68a73df5 100644
--- a/sites/directv.com.uy/directv.com.uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy.channels.xml
@@ -24,7 +24,7 @@
   <channel site="directv.com.uy" lang="es" xmltv_id="CGTNSpanish.cn" site_id="790#CGTN">CGTN-Español</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="CinecanalSouth.us" site_id="507#CC">Cinecanal (COL)</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="CineLatino.mx" site_id="514#CL">Cinelatino</channel>
-  <channel site="directv.com.uy" lang="es" xmltv_id="CinemaxSouth.us" site_id="509#CMAX">Cinemax Sur</channel>
+  <channel site="directv.com.uy" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="509#CMAX">Cinemax Sur</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="CiudadMagazine.ar" site_id="236#MAGA">Magazine</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="CNNChile.cl" site_id="707#CNNC">CNN Chile</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="CNNenEspanol.us" site_id="704#CNNE">CNN en español</channel>
diff --git a/sites/gatotv.com/gatotv.com.channels.xml b/sites/gatotv.com/gatotv.com.channels.xml
index aadfbb94..b1bb4f06 100644
--- a/sites/gatotv.com/gatotv.com.channels.xml
+++ b/sites/gatotv.com/gatotv.com.channels.xml
@@ -208,9 +208,9 @@
   <channel site="gatotv.com" lang="es" xmltv_id="CineLatino.mx" site_id="cinelatino">Cinelatino</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="CinemaPlatino.mx" site_id="cinema_platino">Cinema Platino</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="CinemaPlus.co" site_id="cinema_mas">Cinema +</channel>
-  <channel site="gatotv.com" lang="es" xmltv_id="Cinemax.cl" site_id="cinemax_chile">Cinemax Chile</channel>
-  <channel site="gatotv.com" lang="es" xmltv_id="Cinemax.mx" site_id="cinemax_mexico">Cinemax México</channel>
-  <channel site="gatotv.com" lang="es" xmltv_id="CinemaxPanregional.us" site_id="cinemax_panregional">Cinemax Panregional</channel>
+  <channel site="gatotv.com" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_chile">Cinemax Chile</channel>
+  <channel site="gatotv.com" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_mexico">Cinemax México</channel>
+  <channel site="gatotv.com" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="cinemax_panregional">Cinemax Panregional</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="CineMexicano.mx" site_id="cine_mexicano">Cine Mexicano</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="CineNostalgia.us" site_id="cine_nostalgia">Cine Nostalgia</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="CineSony.us" site_id="cine_sony">Cine Sony</channel>
diff --git a/sites/guide.dstv.com/guide.dstv.com.channels.xml b/sites/guide.dstv.com/guide.dstv.com.channels.xml
index a3617351..02133757 100644
--- a/sites/guide.dstv.com/guide.dstv.com.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com.channels.xml
@@ -257,7 +257,7 @@
   <channel site="guide.dstv.com" lang="en" xmltv_id="TrybeTV.ng" site_id="11c7a294-4a81-4934-8854-f39c4567e91e#TRW">Trybe TV</channel>
   <channel site="guide.dstv.com" lang="en" xmltv_id="TshwaneTV.za" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#TSH">Tshwane TV</channel>
   <channel site="guide.dstv.com" lang="en" xmltv_id="TV1.tz" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#TAS">TV 1</channel>
-  <channel site="guide.dstv.com" lang="en" xmltv_id="TV3Ghana.gh" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#TV7">TV 3</channel>
+  <channel site="guide.dstv.com" lang="en" xmltv_id="TV3.gh" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#TV7">TV 3</channel>
   <channel site="guide.dstv.com" lang="en" xmltv_id="TV47Kenya.ke" site_id="2d274614-6759-4a6d-87a6-8cfb666dc907#T47">TV 47</channel>
   <channel site="guide.dstv.com" lang="en" xmltv_id="TV5MondeAfrica.fr" site_id="08654b4d-2288-4c83-bfb7-0f464d0d9ee1#TVK">TV5Monde Afrique</channel>
   <channel site="guide.dstv.com" lang="en" xmltv_id="TVAfrica.gh" site_id="3ad06d54-5628-48e3-846f-19e72c867e3f#TAW">TV Africa</channel>
diff --git a/sites/horizon.tv/horizon.tv.channels.xml b/sites/horizon.tv/horizon.tv.channels.xml
index e30e0451..5f1e964e 100644
--- a/sites/horizon.tv/horizon.tv.channels.xml
+++ b/sites/horizon.tv/horizon.tv.channels.xml
@@ -33,7 +33,7 @@
   <channel site="horizon.tv" lang="en" xmltv_id="EroXXX.nl" site_id="10131">EroXXX HD</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="10111">Euronews HD</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="EXTASYTV.cz" site_id="10136">Extasy HD</channel>
-  <channel site="horizon.tv" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="10079">Extreme Sports</channel>
+  <channel site="horizon.tv" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="10079">Extreme Sports</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="FashionBox.nl" site_id="10202">FashionBox</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="FashionTVEurope.fr" site_id="10105">Fashion TV HD</channel>
   <channel site="horizon.tv" lang="en" xmltv_id="FastFunBox.nl" site_id="10130">Fast &amp; FunBox HD</channel>
@@ -58,8 +58,8 @@
   <channel site="horizon.tv" lang="sk" xmltv_id="BarrandovKrimi.cz" site_id="10033">Barrandov Krimi HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="Bober.ru" site_id="10178">Bober</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="CartoonNetwork.cz" site_id="10091">Cartoon Network HD</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="Cinemax2.cz" site_id="10124">Cinemax 2 HD</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="Cinemax.cz" site_id="10123">Cinemax HD</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="10124">Cinemax 2 HD</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="10123">Cinemax HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="CNNPrimaNews.cz" site_id="10026">CNN Prima News HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="CoolTV.hu" site_id="10149">Cool TV</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="CSHistory.cz" site_id="10047">CS History</channel>
@@ -93,9 +93,9 @@
   <channel site="horizon.tv" lang="sk" xmltv_id="FilmPlus.hu" site_id="10162">FILM+ HU</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="Folklorika.sk" site_id="10014">Folklorika HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="FoodNetwork.hu" site_id="10056">Food Network HD</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="HBO2.cz" site_id="10121">HBO 2 HD</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="HBO3.cz" site_id="10122">HBO 3 HD</channel>
-  <channel site="horizon.tv" lang="sk" xmltv_id="HBO.cz" site_id="10120">HBO HD</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="HBO2CentralEuropeHD.hu" site_id="10121">HBO 2 HD</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="HBO3CentralEuropeHD.hu" site_id="10122">HBO 3 HD</channel>
+  <channel site="horizon.tv" lang="sk" xmltv_id="HBOCentralEuropeHD.hu" site_id="10120">HBO HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="HirTV.hu" site_id="10137">HirTV</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="History.cz" site_id="10057">History HD</channel>
   <channel site="horizon.tv" lang="sk" xmltv_id="HobbyTV.cz" site_id="10069">Hobby TV HD</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index 5412c5eb..a6b2fb2c 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -19,8 +19,8 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Channel5.uk" site_id="Channel+5">Channel 5</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Channel5.ua" site_id="5+Kanal">5 Kanal</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Channel8International.ru" site_id="8TV">8 Kanal International</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Cinemax2.cz" site_id="Cinemax+2">Cinemax 2</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Cinemax.cz" site_id="Cinemax">Cinemax</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="Cinemax+2">Cinemax 2</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="Cinemax">Cinemax</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="CNNPrimaNews.cz" site_id="CNN+Prima+News">CNN Prima News</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="CoolTV.hu" site_id="Cool+TV">Cool TV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="CredoTV.ro" site_id="Credo">Credo TV</channel>
@@ -86,9 +86,9 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="GoldTV.pl" site_id="Gold+TV">Gold TV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="GolfChannel.us" site_id="Golf+Channel">Golf Channel Czechia</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HAHATV.sk" site_id="HaHa+TV">HaHa TV</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBO2.cz" site_id="HBO2">HBO 2</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBO3.cz" site_id="HBO3">HBO 3</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBO.cz" site_id="HBO">HBO</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBO2CentralEuropeHD.hu" site_id="HBO2">HBO 2</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBO3CentralEuropeHD.hu" site_id="HBO3">HBO 3</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HBOCentralEuropeHD.hu" site_id="HBO">HBO</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HGTVPanregional.us" site_id="HGTV">HGTV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="HirTV.hu" site_id="H%EDr+TV">Hír TV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="History.cz" site_id="History+Channel">History Channel</channel>
@@ -424,7 +424,7 @@
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="EuronewsHungarian.fr" site_id="Euronews+%28hu%29">EuroNews Magyar</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="EWTNEurope.us" site_id="EWTN">EWTN Europe</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="EXTASYTV.cz" site_id="Extasy">Extasy TV</channel>
-  <channel site="m.tv.sms.cz" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="Extreme+Sports">Extreme Sports Channel</channel>
+  <channel site="m.tv.sms.cz" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="Extreme+Sports">Extreme Sports Channel</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="FashionTVEurope.fr" site_id="FashionTV">FashionTV Europe</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="FightBox.nl" site_id="FightBox">FightBox HD</channel>
   <channel site="m.tv.sms.cz" lang="en" xmltv_id="Film4.hu" site_id="Film+4">Film 4</channel>
diff --git a/sites/magentatv.at/magentatv.at.channels.xml b/sites/magentatv.at/magentatv.at.channels.xml
index d59686d9..ba80cf38 100644
--- a/sites/magentatv.at/magentatv.at.channels.xml
+++ b/sites/magentatv.at/magentatv.at.channels.xml
@@ -29,7 +29,7 @@
   <channel site="magentatv.at" lang="de" xmltv_id="EuronewsGerman.fr" site_id="Euronews">euronews (D)</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="Eurosport1.de" site_id="Eurosport_1_HD">Eurosport 1 Germany</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="EvilAngelTV.us" site_id="Evil_Angel_HD">Evil Angel TV</channel>
-  <channel site="magentatv.at" lang="de" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="Extreme_Sports_Channel">Extreme Sports Channel</channel>
+  <channel site="magentatv.at" lang="de" xmltv_id="ExtremeSportsChannel.nl" site_id="Extreme_Sports_Channel">Extreme Sports Channel</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="FixFoxi.de" site_id="fix___foxi">Fix&amp;Foxi</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="GEOTelevision.de" site_id="GEO_Television_HD">GEO TV HD</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="GoTV.at" site_id="gotv">GoTV</channel>
diff --git a/sites/magentatv.de/magentatv.de.channels.xml b/sites/magentatv.de/magentatv.de.channels.xml
index c38a7a02..53a1479c 100644
--- a/sites/magentatv.de/magentatv.de.channels.xml
+++ b/sites/magentatv.de/magentatv.de.channels.xml
@@ -58,7 +58,7 @@
   <channel site="magentatv.de" lang="de" xmltv_id="Eurosport1.fr" site_id="389">Eurosport 1</channel>
   <channel site="magentatv.de" lang="de" xmltv_id="Eurosport2.fr" site_id="18">Eurosport 2</channel>
   <channel site="magentatv.de" lang="de" xmltv_id="EuroStar.tr" site_id="21">Eurostar TV</channel>
-  <channel site="magentatv.de" lang="de" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="122">Extreme Sports</channel>
+  <channel site="magentatv.de" lang="de" xmltv_id="ExtremeSportsChannel.nl" site_id="122">Extreme Sports</channel>
   <channel site="magentatv.de" lang="de" xmltv_id="FashionTVEurope.fr" site_id="5206">Fashion TV</channel>
   <channel site="magentatv.de" lang="de" xmltv_id="FCBayernTV.de" site_id="603">FC BAYERN.TV LIVE</channel>
   <channel site="magentatv.de" lang="de" xmltv_id="France24French.fr" site_id="5316">France 24 francais</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
index 056f1e24..49c507ce 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
@@ -23,7 +23,7 @@
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="CNBCEurope.uk" site_id="260">CNBC Europe</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="170">CNN International Europe</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="276">EuroNews English</channel>
-  <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="314">Extreme Sports Channel</channel>
+  <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="314">Extreme Sports Channel</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="FashionTVEurope.fr" site_id="326">FashionTV Europe</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="France24English.fr" site_id="274">France 24 English</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="en" xmltv_id="Grand.rs" site_id="300">Grand</channel>
@@ -55,8 +55,8 @@
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="BBCEarth.ro" site_id="631">BBC Earth Romania</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="BHT1.ba" site_id="125">BHT 1</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="BoomerangCEE.us" site_id="425">Boomerang Central &amp; Eastern Europe</channel>
-  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="Cinemax2.hr" site_id="365">Cinemax 2</channel>
-  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="Cinemax.hr" site_id="399">Cinemax</channel>
+  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="365">Cinemax 2</channel>
+  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="399">Cinemax</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="CineStarTV1.hr" site_id="208">CineStar TV 1 Hrvatska</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="CineStarTVAction.hr" site_id="218">CineStar TV Action Hrvatska</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="CineStarTVFantasy.hr" site_id="633">CineStar TV Fantasy</channel>
diff --git a/sites/melita.com/melita.com.channels.xml b/sites/melita.com/melita.com.channels.xml
index e6473644..def891cc 100644
--- a/sites/melita.com/melita.com.channels.xml
+++ b/sites/melita.com/melita.com.channels.xml
@@ -37,7 +37,7 @@
   <channel site="melita.com" lang="en" xmltv_id="Eurosport1.fr" site_id="9b2ff2da-b9d9-4ef7-be19-c16f7b6981f3">Eurosport HD</channel>
   <channel site="melita.com" lang="en" xmltv_id="Eurosport2.fr" site_id="ddd38bf4-0324-4a46-9174-b7023c632c60">Eurosport 2</channel>
   <channel site="melita.com" lang="en" xmltv_id="EWTNEurope.us" site_id="f3ff65cf-ac72-42e1-bb2d-438f4c77590e">EWTN</channel>
-  <channel site="melita.com" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="b17bc110-1dce-40bd-80e1-53716927776d">Extreme Sports</channel>
+  <channel site="melita.com" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="b17bc110-1dce-40bd-80e1-53716927776d">Extreme Sports</channel>
   <channel site="melita.com" lang="en" xmltv_id="FashionTVEurope.fr" site_id="b99f05b1-f4c9-4a23-a2fe-f891a9a95cee">FTV HD</channel>
   <channel site="melita.com" lang="en" xmltv_id="FLivingChannel.mt" site_id="00144de1-557a-418f-90ce-f518aa195f35">f Living</channel>
   <channel site="melita.com" lang="en" xmltv_id="FoodNetworkEMEA.us" site_id="f18b81d1-e948-47a6-94d2-73ae397c34bd">Food Network HD</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index abc027f1..4298d85c 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -29,7 +29,7 @@
   <channel site="mi.tv" lang="es" xmltv_id="CineAr.ar" site_id="ar#incaa-tv">Cine.ar</channel>
   <channel site="mi.tv" lang="es" xmltv_id="CinecanalEast.us" site_id="ar#cinecanal">Cinecanal</channel>
   <channel site="mi.tv" lang="es" xmltv_id="CineLatino.mx" site_id="ar#cine-latino">CineLatino</channel>
-  <channel site="mi.tv" lang="es" xmltv_id="CinemaxPanregional.us" site_id="ar#cinemax">Cinemax</channel>
+  <channel site="mi.tv" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="ar#cinemax">Cinemax</channel>
   <channel site="mi.tv" lang="es" xmltv_id="CiudadMagazine.ar" site_id="ar#magazine">Ciudad Magazine</channel>
   <channel site="mi.tv" lang="es" xmltv_id="CMElCanaldelaMusica.ar" site_id="ar#canal-de-la-musica">CM El Canal de la Música</channel>
   <channel site="mi.tv" lang="es" xmltv_id="CN23.ar" site_id="ar#cn-23">CN23</channel>
diff --git a/sites/mtel.ba/mtel.ba.channels.xml b/sites/mtel.ba/mtel.ba.channels.xml
index 29de1faf..d8032634 100644
--- a/sites/mtel.ba/mtel.ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba.channels.xml
@@ -159,7 +159,7 @@
   <channel site="mtel.ba" lang="en" xmltv_id="Erotic8.rs" site_id="909#191">Erotic 8</channel>
   <channel site="mtel.ba" lang="en" xmltv_id="EroX.nl" site_id="900#175">Erox HD</channel>
   <channel site="mtel.ba" lang="en" xmltv_id="EroXXX.nl" site_id="901#177">Eroxxx HD</channel>
-  <channel site="mtel.ba" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="125#270">Extreme Sports Channel</channel>
+  <channel site="mtel.ba" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="125#270">Extreme Sports Channel</channel>
   <channel site="mtel.ba" lang="en" xmltv_id="JimJamEurope.uk" site_id="214#271">JimJam Europe</channel>
   <channel site="mtel.ba" lang="en" xmltv_id="LFCTV.uk" site_id="086#435">LFC TV</channel>
   <channel site="mtel.ba" lang="en" xmltv_id="MTV00s.uk" site_id="603#171">MTV 00s</channel>
diff --git a/sites/mts.rs/mts.rs.channels.xml b/sites/mts.rs/mts.rs.channels.xml
index c7359091..ab878f26 100644
--- a/sites/mts.rs/mts.rs.channels.xml
+++ b/sites/mts.rs/mts.rs.channels.xml
@@ -70,7 +70,7 @@
   <channel site="mts.rs" lang="sr" xmltv_id="EuronewsSerbia.rs" site_id="112#818">EuroNews Serbia</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="Eurosport1.fr" site_id="315#58">Eurosport 1</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="Eurosport2.fr" site_id="316#59">Eurosport 2</channel>
-  <channel site="mts.rs" lang="sr" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="317#289">Extreme Sports Channel</channel>
+  <channel site="mts.rs" lang="sr" xmltv_id="ExtremeSportsChannel.nl" site_id="317#289">Extreme Sports Channel</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="FACETV.ba" site_id="655#820">Face TV</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="FashionBox.nl" site_id="265#603">FashionBox HD</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="FashionTVEurope.fr" site_id="274#162">Fashion TV Europe</channel>
diff --git a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
index a17b4a01..c85c3a80 100644
--- a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
+++ b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
@@ -58,8 +58,8 @@
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CanalPlusDomo.pl" site_id="835">CANAL+ Domo</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CartoonNetwork.cz" site_id="326">Cartoon Network</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CBSRealityEMEA.uk" site_id="323">CBS Reality</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Cinemax2.cz" site_id="112">Cinemax2</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Cinemax.cz" site_id="7">Cinemax</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="112">Cinemax2</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="7">Cinemax</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CNBCEurope.uk" site_id="152">CNBC Europe</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CNNPrimaNews.cz" site_id="818">CNN Prima NEWS HD</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="CrimePlusInvestigationCEE.uk" site_id="368">Crime &amp; Investigation</channel>
@@ -95,9 +95,9 @@
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="FilmPlus.cz" site_id="63">Film+</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="FoodNetworkEMEA.us" site_id="471">Food Network</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="GolfChannel.us" site_id="225">Golf Channel</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBO2.cz" site_id="6">HBO2</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBO3.cz" site_id="512">HBO3</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBO.cz" site_id="5">HBO</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBO2CentralEuropeHD.hu" site_id="6">HBO2</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBO3CentralEuropeHD.hu" site_id="512">HBO3</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HBOCentralEuropeHD.hu" site_id="5">HBO</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="History.cz" site_id="125">History HD</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HTV1.vn" site_id="399">HTV1</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="HTV2.vn" site_id="400">HTV2</channel>
@@ -216,7 +216,7 @@
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="EroX.nl" site_id="300">Erox</channel>
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="EroXXX.nl" site_id="328">Eroxxx</channel>
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="117">EuroNews</channel>
-  <channel site="mujtvprogram.cz" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="85">Extreme Sports Channel</channel>
+  <channel site="mujtvprogram.cz" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="85">Extreme Sports Channel</channel>
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="FashionTVEurope.fr" site_id="119">Fashion TV Europe</channel>
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="FastFunBox.nl" site_id="404">Fast&amp;FunBox</channel>
   <channel site="mujtvprogram.cz" lang="en" xmltv_id="FightBox.nl" site_id="301">FightBox</channel>
@@ -251,7 +251,7 @@
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="ducktv.sk" site_id="109">Duck TV</channel>
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="Dvojka.sk" site_id="180">Dvojka HD</channel>
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="FilmBoxPremium.cz" site_id="449">FilmBox Premium</channel>
-  <channel site="mujtvprogram.cz" lang="sk" xmltv_id="HBO3.cz" site_id="525">HBO3</channel>
+  <channel site="mujtvprogram.cz" lang="sk" xmltv_id="HBO3CentralEuropeHD.hu" site_id="525">HBO3</channel>
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="Jednotka.sk" site_id="181">Jednotka HD</channel>
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="JOJCinema.sk" site_id="459">JOJCinema.sk</channel>
   <channel site="mujtvprogram.cz" lang="sk" xmltv_id="JOJFamily.sk" site_id="532">JOJ Family HD</channel>
diff --git a/sites/musor.tv/musor.tv.channels.xml b/sites/musor.tv/musor.tv.channels.xml
index 396f76fb..8b503e89 100644
--- a/sites/musor.tv/musor.tv.channels.xml
+++ b/sites/musor.tv/musor.tv.channels.xml
@@ -5,7 +5,7 @@
   <channel site="musor.tv" lang="en" xmltv_id="ClubMTVEurope.uk" site_id="CLUB_MTV">club MTV</channel>
   <channel site="musor.tv" lang="en" xmltv_id="EEurope.us" site_id="E_ENTERTAINMENT">E! Entertainment</channel>
   <channel site="musor.tv" lang="en" xmltv_id="EnglishClubTV.uk" site_id="ENGLISH_CLUB_TV">English Club TV</channel>
-  <channel site="musor.tv" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="EXTREMESP">Extreme Sports Channel</channel>
+  <channel site="musor.tv" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="EXTREMESP">Extreme Sports Channel</channel>
   <channel site="musor.tv" lang="en" xmltv_id="FightBox.nl" site_id="FIGHTBOX_EN">Fightbox</channel>
   <channel site="musor.tv" lang="en" xmltv_id="FilmBoxArthouse.nl" site_id="FILMBOX_ARTHOUSE">Filmbox Arthouse</channel>
   <channel site="musor.tv" lang="en" xmltv_id="MTV00s.uk" site_id="MTV00S">MTV 00s</channel>
@@ -36,8 +36,8 @@
   <channel site="musor.tv" lang="hu" xmltv_id="BoomerangCEE.us" site_id="BOOMERANG">Boomerang</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="CartoonNetwork.hu" site_id="CARTOON">Cartoon Network</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="CBSRealityEMEA.uk" site_id="CBSREALITY">CBS Reality</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="Cinemax2.hu" site_id="CINEMAX2">Cinemax 2</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="Cinemax.hu" site_id="CINEMAX">Cinemax</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="CINEMAX2">Cinemax 2</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="CINEMAX">Cinemax</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="CNBCEurope.uk" site_id="CNBC">CNBC</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="ComedyCentralFamily.hu" site_id="COMEDY_CENTRAL_FAMILY">Comedy Central Family</channel>
@@ -86,9 +86,9 @@
   <channel site="musor.tv" lang="hu" xmltv_id="Galaxy4.hu" site_id="GALAXY">Galaxy4</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="Gametoon.nl" site_id="GAMETOON">Gametoon</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="Hatoscsatorna.hu" site_id="HATOS_CSATORNA">Hatoscsatorna</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="HBO2.hu" site_id="HBO2">HBO 2</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="HBO3.hu" site_id="HBO3">HBO 3</channel>
-  <channel site="musor.tv" lang="hu" xmltv_id="HBO.hu" site_id="HBO">HBO</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="HBO2CentralEuropeHD.hu" site_id="HBO2">HBO 2</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="HBO3CentralEuropeHD.hu" site_id="HBO3">HBO 3</channel>
+  <channel site="musor.tv" lang="hu" xmltv_id="HBOCentralEuropeHD.hu" site_id="HBO">HBO</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="HegyvidekTV.hu" site_id="HEGYVIDEK_TV">Hegyvidék TV</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="HetiTV.hu" site_id="HETI_TV">Heti TV</channel>
   <channel site="musor.tv" lang="hu" xmltv_id="HGTVPanregional.us" site_id="HGTV">HGTV</channel>
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
index 3ed3f3ce..2b87eccf 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
@@ -140,7 +140,7 @@
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="Eurosport1.fr" site_id="154">Eurosport</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="Eurosport2.fr" site_id="491">Eurosport 2</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="EWTNEspanaLatinAmerica.us" site_id="190">EWTN</channel>
-  <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="550">Extreme Sports</channel>
+  <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="ExtremeSportsChannel.nl" site_id="550">Extreme Sports</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="FactoriadeFiccion.es" site_id="506">FDF Telecinco</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="FoxLife.es" site_id="660">Fox Life</channel>
   <channel site="programacion-tv.elpais.com" lang="es" xmltv_id="Fox.es" site_id="202">FOX</channel>
diff --git a/sites/programetv.ro/programetv.ro.channels.xml b/sites/programetv.ro/programetv.ro.channels.xml
index f93f7a24..a4584a1d 100644
--- a/sites/programetv.ro/programetv.ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro.channels.xml
@@ -37,8 +37,8 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="CartoonNetwork.ro" site_id="cartoon-network">Cartoon Network</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="CBSRealityEMEA.uk" site_id="cbs-reality">CBS Reality</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="CGTN.cn" site_id="cgtn">CGTN</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="Cinemax2.ro" site_id="cinemax-2">Cinemax 2</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="Cinemax.ro" site_id="cinemax">Cinemax</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="cinemax-2">Cinemax 2</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="cinemax">Cinemax</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="ClubMTVEurope.uk" site_id="club-mtv">Club MTV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="CNNInternationalEurope.us" site_id="cnn">CNN</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="ComedyCentral.ro" site_id="comedy-central">Comedy Central</channel>
@@ -76,7 +76,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="Eurosport1.ro" site_id="eurosport-1">Eurosport 1</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="Eurosport2.ro" site_id="eurosport-2">Eurosport 2</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="Eurosport4K.fr" site_id="eurosport-4k">Eurosport 4K</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="FashionBox.nl" site_id="fashion-box-hd">FashionBox HD</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="FashionTVEurope.fr" site_id="fashion-tv">FashionTV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="FavoritTV.ro" site_id="favorit">Favorit TV</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
index 31b90da5..726cc034 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
@@ -127,8 +127,8 @@
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="CBSReality.pl" site_id="cbs-reality-318">CBS Reality Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="CGTN.cn" site_id="cctv-news-291">CGTN</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ChannelOne.ru" site_id="channel-one-russia-276">Perviy kanal Europa</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="Cinemax2.pl" site_id="cinemax2-58">Cinemax 2 Central Europe</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="Cinemax.pl" site_id="cinemax-59">Cinemax Central Europe</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="cinemax2-58">Cinemax 2 Central Europe</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="cinemax-59">Cinemax Central Europe</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ClubMTVEurope.uk" site_id="mtv-dance-481">Club MTV</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ComedyCentral.pl" site_id="comedy-central-63">Comedy Central Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="CrimePlusInvestigationPolsat.pl" site_id="ci-polsat-257">Crime + Investigation Polsat</channel>
@@ -161,7 +161,7 @@
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="EuronewsFrench.fr" site_id="euronews-fr-665">EuroNews Français</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Eurosport1.pl" site_id="eurosport-1-93">Eurosport 1 Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Eurosport2.pl" site_id="eurosport-2-76">Eurosport 2 Polska</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="ExtremeSportsChannel.pl" site_id="extreme-sports-channel-231">Extreme Sports Channel Polska</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="ExtremeSportsChannelPolska.pl" site_id="extreme-sports-channel-231">Extreme Sports Channel Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="FashionBox.nl" site_id="fashionbox-hd-171">FashionBox HD</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="FightBox.nl" site_id="fightbox-hd-453">FightBox HD</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="FightKlub.pl" site_id="fightklub-78">Fight Klub</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be.channels.xml b/sites/proximusmwc.be/proximusmwc.be.channels.xml
index 877b37c5..16d5f789 100644
--- a/sites/proximusmwc.be/proximusmwc.be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be.channels.xml
@@ -12,7 +12,7 @@
   <channel site="proximusmwc.be" lang="en" xmltv_id="CNNInternationalEurope.us" site_id="UID50032">CNN</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="eSports1.de" site_id="UID0689">eSportsONE</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="UID50085">Euronews E</channel>
-  <channel site="proximusmwc.be" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="UID0100">Extreme</channel>
+  <channel site="proximusmwc.be" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="UID0100">Extreme</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="FashionTVEurope.fr" site_id="UID50031">FashionTV</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="Motorvision.de" site_id="UID2063">MVTV</channel>
   <channel site="proximusmwc.be" lang="en" xmltv_id="MTVLive.uk" site_id="UID50315">MTV Live HD</channel>
diff --git a/sites/reportv.com.ar/reportv.com.ar.channels.xml b/sites/reportv.com.ar/reportv.com.ar.channels.xml
index 5eae3c4b..e71bec88 100644
--- a/sites/reportv.com.ar/reportv.com.ar.channels.xml
+++ b/sites/reportv.com.ar/reportv.com.ar.channels.xml
@@ -76,7 +76,7 @@
   <channel site="reportv.com.ar" lang="es" xmltv_id="BoliviaTV.bo" site_id="4055">BOLIVIA TV</channel>
   <channel site="reportv.com.ar" lang="es" xmltv_id="BrazzersTVEurope.us" site_id="3290">BRAZZERS TV</channel>
   <channel site="reportv.com.ar" lang="es" xmltv_id="CanalI.ve" site_id="967">CANAL I</channel>
-  <channel site="reportv.com.ar" lang="es" xmltv_id="CinemaxSouth.us" site_id="2293">CINEMAX</channel>
+  <channel site="reportv.com.ar" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="2293">CINEMAX</channel>
   <channel site="reportv.com.ar" lang="es" xmltv_id="CNNInternationalLatinAmerica.us" site_id="13">CNN</channel>
   <channel site="reportv.com.ar" lang="es" xmltv_id="Colombeia.ve" site_id="2626">COLOMBEIA</channel>
   <channel site="reportv.com.ar" lang="es" xmltv_id="ComedyCentralSouth.us" site_id="2037">COMEDY CENTRAL</channel>
diff --git a/sites/siba.com.co/siba.com.co.channels.xml b/sites/siba.com.co/siba.com.co.channels.xml
index acb17767..35c10954 100644
--- a/sites/siba.com.co/siba.com.co.channels.xml
+++ b/sites/siba.com.co/siba.com.co.channels.xml
@@ -18,7 +18,7 @@
   <channel site="siba.com.co" lang="es" xmltv_id="CinecanalPacific.us" site_id="407">Cinecanal Chile</channel>
   <channel site="siba.com.co" lang="es" xmltv_id="CineLatino.mx" site_id="408">CineLatino</channel>
   <channel site="siba.com.co" lang="es" xmltv_id="CinemaPlus.co" site_id="409">Cinema +</channel>
-  <channel site="siba.com.co" lang="es" xmltv_id="CinemaxPanregional.us" site_id="839">Cinemax Latinoamérica</channel>
+  <channel site="siba.com.co" lang="es" xmltv_id="CinemaxLatinAmerica.us" site_id="839">Cinemax Latinoamérica</channel>
   <channel site="siba.com.co" lang="es" xmltv_id="CitytvBogota.co" site_id="412">City TV</channel>
   <channel site="siba.com.co" lang="es" xmltv_id="ClaroCinema.mx" site_id="985">Claro Cinema</channel>
   <channel site="siba.com.co" lang="es" xmltv_id="ClaroMusicaTV.co" site_id="566">Claro música TV</channel>
diff --git a/sites/startimestv.com/startimestv.com.channels.xml b/sites/startimestv.com/startimestv.com.channels.xml
index 19086785..0047a82d 100644
--- a/sites/startimestv.com/startimestv.com.channels.xml
+++ b/sites/startimestv.com/startimestv.com.channels.xml
@@ -300,7 +300,7 @@
   <channel site="startimestv.com" lang="en" xmltv_id="TV1.tz" site_id="281">TV1</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TV10.rw" site_id="386">TV 10</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TV3.tz" site_id="1794707110">TV3 Tanzania</channel>
-  <channel site="startimestv.com" lang="en" xmltv_id="TV3Ghana.gh" site_id="682">TV3 Ghana</channel>
+  <channel site="startimestv.com" lang="en" xmltv_id="TV3.gh" site_id="682">TV3 Ghana</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TV5MondeAfrica.fr" site_id="381">TV5 MONDE</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TV5MondeStyle.fr" site_id="256985539">STYLE TV</channel>
   <channel site="startimestv.com" lang="en" xmltv_id="TVAlBayane.ci" site_id="106187231">ALBAYAN TV</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_en.channels.xml b/sites/teliatv.ee/teliatv.ee_en.channels.xml
index ec5c38e8..0a876e20 100644
--- a/sites/teliatv.ee/teliatv.ee_en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_en.channels.xml
@@ -78,7 +78,7 @@
   <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000action.ru" site_id="en#227">TV1000 Action</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000.ru" site_id="en#224">TV1000 East</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000russkoe.ru" site_id="en#225">TV1000 World Kino</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="TV3LifeEstonia.ee" site_id="en#221">TV3 Life</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="TV3Life.ee" site_id="en#221">TV3 Life</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport.uk" site_id="en#228">TV3 Sport</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport2.uk" site_id="en#229">TV3 Sport2</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ViasatExplore.se" site_id="en#230">Viasat Explore</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_et.channels.xml b/sites/teliatv.ee/teliatv.ee_et.channels.xml
index 3fb4c7d5..f659c76a 100644
--- a/sites/teliatv.ee/teliatv.ee_et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_et.channels.xml
@@ -57,10 +57,10 @@
   <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000action.ru" site_id="et#227">TV1000 Action</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000.ru" site_id="et#224">TV1000 East</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000russkoe.ru" site_id="et#225">TV1000 World Kino</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="TV3Estonia.ee" site_id="et#2">TV3</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="TV3LifeEstonia.ee" site_id="et#221">TV3 Life</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="TV3PlusLatvia.lv" site_id="et#1349">3+</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="TV6Estonia.ee" site_id="et#223">TV6</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="TV3.ee" site_id="et#2">TV3</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="TV3Life.ee" site_id="et#221">TV3 Life</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="TV3Plus.lv" site_id="et#1349">3+</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="TV6.ee" site_id="et#223">TV6</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TVXXI.lv" site_id="et#8">TVXXI</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ViasatExplore.se" site_id="et#230">Viasat Explore</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ViasatHistory.se" site_id="et#231">Viasat History</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
index e7934972..547584aa 100644
--- a/sites/teliatv.ee/teliatv.ee_ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
@@ -66,13 +66,13 @@
   <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000action.ru" site_id="ru#227">TV1000 Action</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000.ru" site_id="ru#224">TV1000 East</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000russkoe.ru" site_id="ru#225">TV1000 World Kino</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Estonia.ee" site_id="ru#2">TV3</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3LifeEstonia.ee" site_id="ru#221">TV3 Life</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3PlusLatvia.lv" site_id="ru#1349">3+</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3.ee" site_id="ru#2">TV3</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Life.ee" site_id="ru#221">TV3 Life</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Plus.lv" site_id="ru#1349">3+</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport.uk" site_id="ru#228">TV3 Sport</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport2.uk" site_id="ru#229">TV3 Sport2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV5MondeEurope.fr" site_id="ru#85">TV5MONDE Europe</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV6Estonia.ee" site_id="ru#223">TV6</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV6.ee" site_id="ru#223">TV6</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TVN.ee" site_id="ru#140">TVN</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TVXXI.lv" site_id="ru#8">TVXXI</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Ukraina24.ua" site_id="ru#1347">Украина 24</channel>
diff --git a/sites/telkku.com/telkku.com.channels.xml b/sites/telkku.com/telkku.com.channels.xml
index 4c783c88..978a929a 100644
--- a/sites/telkku.com/telkku.com.channels.xml
+++ b/sites/telkku.com/telkku.com.channels.xml
@@ -57,7 +57,7 @@
   <channel site="telkku.com" lang="fi" xmltv_id="CMoreSport2.fi" site_id="default_builtin_channelgroup4#mtv-sport-2">C More Sport 2</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="CMoreStars.se" site_id="default_builtin_channelgroup4#cmore-stars">C More Stars</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="DiscoveryChannel.fi" site_id="default_builtin_channelgroup13#discovery-channel">Discovery Channel</channel>
-  <channel site="telkku.com" lang="fi" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="default_builtin_channelgroup9#extreme-sports">Extreme Sports</channel>
+  <channel site="telkku.com" lang="fi" xmltv_id="ExtremeSportsChannel.nl" site_id="default_builtin_channelgroup9#extreme-sports">Extreme Sports</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="Fox.fi" site_id="default_builtin_channelgroup1#fox">Fox</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="Frii.fi" site_id="default_builtin_channelgroup1#frii">Frii</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="VICETV.us" site_id="default_builtin_channelgroup13#h2">H2</channel>
@@ -79,7 +79,7 @@
   <channel site="telkku.com" lang="fi" xmltv_id="TV3.se" site_id="default_builtin_channelgroup20#tv3">TV3</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="TV4.se" site_id="default_builtin_channelgroup20#tv4">TV4</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="TV5.fi" site_id="default_builtin_channelgroup1#tv5">TV5</channel>
-  <channel site="telkku.com" lang="fi" xmltv_id="TV6Sweden.se" site_id="default_builtin_channelgroup20#tv6">TV6</channel>
+  <channel site="telkku.com" lang="fi" xmltv_id="TV6.se" site_id="default_builtin_channelgroup20#tv6">TV6</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="VFilmAction.se" site_id="default_builtin_channelgroup10#viasat-film-action">V film ACTION</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="VFilmFamily.se" site_id="default_builtin_channelgroup10#viasat-film-family">V film FAMILY</channel>
   <channel site="telkku.com" lang="fi" xmltv_id="VFilmHits.se" site_id="default_builtin_channelgroup10#viasat-film-hits">V film HITS</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch.channels.xml
index c1643889..a13a7b3e 100644
--- a/sites/tv.blue.ch/tv.blue.ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch.channels.xml
@@ -420,7 +420,7 @@
   <channel site="tv.blue.ch" lang="en" xmltv_id="EnglishClubTV.uk" site_id="1398">English Club TV</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="164">EuroNews English</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="Eurosport1.fr" site_id="1488">Eurosport 1</channel>
-  <channel site="tv.blue.ch" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="1555">Extreme Sports Channel</channel>
+  <channel site="tv.blue.ch" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="1555">Extreme Sports Channel</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="FashionTVEurope.fr" site_id="175">FashionTV Europe</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="Film4.uk" site_id="176">Film 4 UK</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="FoodNetwork.uk" site_id="1292">Food Network UK</channel>
diff --git a/sites/tv.dir.bg/tv.dir.bg.channels.xml b/sites/tv.dir.bg/tv.dir.bg.channels.xml
index 165d7cc3..7eed8b70 100644
--- a/sites/tv.dir.bg/tv.dir.bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg.channels.xml
@@ -24,8 +24,8 @@
   <channel site="tv.dir.bg" lang="bg" xmltv_id="CartoonNetwork.bg" site_id="6">Cartoon Network</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="CBSRealityEMEA.uk" site_id="93">CBS Reality</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="ChannelOne.ru" site_id="55">Perviy kanal</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="Cinemax2.bg" site_id="105">Cinemax 2</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="Cinemax.bg" site_id="90">Cinemax</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="105">Cinemax 2</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="90">Cinemax</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="CNNInternationalEurope.us" site_id="49">CNN</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="CrimePlusInvestigation.uk" site_id="219">Crime + Investigation</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="DaVinci.de" site_id="176">Da Vinci</channel>
@@ -43,18 +43,18 @@
   <channel site="tv.dir.bg" lang="bg" xmltv_id="Eurosport1.fr" site_id="13">Eurosport 1</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="Eurosport2.fr" site_id="101">Eurosport 2</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="Eurocom.bg" site_id="14">Evrokom</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="220">Extreme Sports Channel</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="ExtremeSportsChannel.nl" site_id="220">Extreme Sports Channel</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="FenFolkTV.bg" site_id="301">Fen Folk</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="FenTV.bg" site_id="71">Fen TV</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="FilmBoxExtra.bg" site_id="282">FilmBox Extra HD</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="FilmBoxStars.bg" site_id="355">FilmBox Plus</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="FoodNetworkEMEA.us" site_id="234">Food Network</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="StarChannel.bg" site_id="230">Fox</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="StarCrimeBulgaria.bg" site_id="86">Fox Crime</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="StarCrime.bg" site_id="86">Fox Crime</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="StarLife.bg" site_id="69">Fox Life</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBO2CEE.hu" site_id="89">HBO 2</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBO3CEE.hu" site_id="319">HBO 3</channel>
-  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBOCEE.hu" site_id="58">HBO</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBO2CentralEurope.hu" site_id="89">HBO 2</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBO3CentralEurope.hu" site_id="319">HBO 3</channel>
+  <channel site="tv.dir.bg" lang="bg" xmltv_id="HBOCentralEuropeHD.hu" site_id="58">HBO</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="HGTVPanregional.us" site_id="382">HGTV</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="HobbyTV.bg" site_id="80">Hobby TV</channel>
   <channel site="tv.dir.bg" lang="bg" xmltv_id="InvestigationDiscoveryEurope.us" site_id="246">Investigation Discovery</channel>
diff --git a/sites/tv.lv/tv.lv.channels.xml b/sites/tv.lv/tv.lv.channels.xml
index 94926437..91df22e3 100644
--- a/sites/tv.lv/tv.lv.channels.xml
+++ b/sites/tv.lv/tv.lv.channels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="tv.lv" lang="lv" xmltv_id="TV3PlusLatvia.lv" site_id="3-1">3+</channel>
+  <channel site="tv.lv" lang="lv" xmltv_id="TV3Plus.lv" site_id="3-1">3+</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="ChannelOne.ru" site_id="pbk-1">Perviy kanal</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="EpicDrama.se" site_id="epic-drama-cee">Epic Drama</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="Eurosport1.fr" site_id="eurosport-1">Eurosport 1</channel>
@@ -11,12 +11,12 @@
   <channel site="tv.lv" lang="lv" xmltv_id="RENTVBaltic.lv" site_id="rentv-baltic">REN TV Baltic</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="vijuTV1000.ru" site_id="tv1000-cee">TV 1000 CEE</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="vijuTV1000russkoe.ru" site_id="tv1000-kino">TV 1000 Russkoe Kino</channel>
-  <channel site="tv.lv" lang="lv" xmltv_id="TV3Latvia.lv" site_id="tv3-1">TV 3</channel>
-  <channel site="tv.lv" lang="lv" xmltv_id="TV3LifeLatvia.lv" site_id="tv3-life">TV 3 Life</channel>
+  <channel site="tv.lv" lang="lv" xmltv_id="TV3.lv" site_id="tv3-1">TV 3</channel>
+  <channel site="tv.lv" lang="lv" xmltv_id="TV3Life.lv" site_id="tv3-life">TV 3 Life</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="TV3Mini.lv" site_id="tv3-mini">TV 3 Mini</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="TV3Sport.uk" site_id="tv3-sport">TV 3 Sport</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="TV3Sport2.uk" site_id="tv3-sport-2">TV 3 Sport 2</channel>
-  <channel site="tv.lv" lang="lv" xmltv_id="TV6Latvia.lv" site_id="tv6-1">TV 6</channel>
+  <channel site="tv.lv" lang="lv" xmltv_id="TV6.lv" site_id="tv6-1">TV 6</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="ViasatExplore.se" site_id="viasat-explore-nordic">Viasat Explore Nordic</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="ViasatHistory.se" site_id="viasat-history-cee">Viasat History CEE</channel>
   <channel site="tv.lv" lang="lv" xmltv_id="ViasatNature.se" site_id="viasat-nature-cee">Viasat Nature CEE</channel>
diff --git a/sites/tv.nu/tv.nu.channels.xml b/sites/tv.nu/tv.nu.channels.xml
index 29a6ea2b..10c8d100 100644
--- a/sites/tv.nu/tv.nu.channels.xml
+++ b/sites/tv.nu/tv.nu.channels.xml
@@ -58,7 +58,7 @@
   <channel site="tv.nu" lang="sv" xmltv_id="Eurosport1.fr" site_id="eurosport-1">Eurosport 1</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="Eurosport2.fr" site_id="eurosport-2">Eurosport 2</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="ExpressenTV.se" site_id="expressen-tv">Expressen TV</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="FashionTVEurope.fr" site_id="ftv">FTV</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="FightSports.us" site_id="fight-sports">Fight Sports</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="France2.fr" site_id="france-2">France 2</channel>
@@ -135,16 +135,16 @@
   <channel site="tv.nu" lang="sv" xmltv_id="TV2.dk" site_id="tv2">TV2</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV2.no" site_id="tv2 (Norge)">TV2</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV3.se" site_id="tv3">TV3</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="TV3Danmark.dk" site_id="tv3-danmark">TV3 Danmark</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="TV3Norway.no" site_id="tv3-norge">TV3 Norge</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="TV3.dk" site_id="tv3-danmark">TV3 Danmark</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="TV3.no" site_id="tv3-norge">TV3 Norge</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV3Plus.dk" site_id="3-plus-danmark">3 Plus Danmark</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV4.se" site_id="tv4">TV4</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV4Fakta.se" site_id="tv4-fakta">TV4 Fakta</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV4Film.se" site_id="tv4-film">TV4 Film</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV4Guld.se" site_id="tv4-guld">TV4 Guld</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TV5MondeEurope.fr" site_id="tv5-monde-europe">TV5 Monde Europe</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="TV6Sweden.se" site_id="tv6">TV6</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="TV8Sweden.se" site_id="tv8">TV8</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="TV6.se" site_id="tv6">TV6</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="TV8.se" site_id="tv8">TV8</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TVChile.cl" site_id="tv-chile-internacional">TV Chile Internacional</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="tve-internacional">TVE Internacional</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="TVPPolonia.pl" site_id="tv-polonia">TV Polonia</channel>
diff --git a/sites/tv.post.lu/tv.post.lu.channels.xml b/sites/tv.post.lu/tv.post.lu.channels.xml
index a1cfcaa3..036c2ba4 100644
--- a/sites/tv.post.lu/tv.post.lu.channels.xml
+++ b/sites/tv.post.lu/tv.post.lu.channels.xml
@@ -211,7 +211,7 @@
   <channel site="tv.post.lu" lang="en" xmltv_id="EnglishClubTV.uk" site_id="f2e8f340-6ffe-11e9-915f-ab32be3854aa">English Club TV</channel>
   <channel site="tv.post.lu" lang="en" xmltv_id="EroX.nl" site_id="eef09310-70c6-11e9-a762-3be38d7f533c">Erox HD</channel>
   <channel site="tv.post.lu" lang="en" xmltv_id="EuronewsGerman.fr" site_id="ac5ac6e0-809a-11e9-b5ca-f345a2ed0fbe">Euronews</channel>
-  <channel site="tv.post.lu" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="69f2b820-9e69-11e9-bccd-adfabb07232d">Extreme Sports Channel</channel>
+  <channel site="tv.post.lu" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="69f2b820-9e69-11e9-bccd-adfabb07232d">Extreme Sports Channel</channel>
   <channel site="tv.post.lu" lang="en" xmltv_id="FashionBox.nl" site_id="0fdffad0-7012-11e9-a762-3be38d7f533c">FashionBox HD</channel>
   <channel site="tv.post.lu" lang="en" xmltv_id="FashionTVUHD.fr" site_id="8742ebe0-70cc-11e9-a762-3be38d7f533c">Fashion TV UHD</channel>
   <channel site="tv.post.lu" lang="en" xmltv_id="FightBox.nl" site_id="6ee4c410-700e-11e9-a762-3be38d7f533c">FightBox</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
index fbdbf22a..315641ed 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
@@ -68,7 +68,7 @@
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="Eurosport1.ru" site_id="213#eurosport-677">Eurosport 1 Rossiya</channel>
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="Eurosport2.ru" site_id="213#eurosport-2-720">Eurosport 2 Rossiya</channel>
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="Evrokino.ru" site_id="213#evrokino-505">Evrokino</channel>
-  <channel site="tv.yandex.ru" lang="ru" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="213#extreme-sports-484">Extreme Sports Channel</channel>
+  <channel site="tv.yandex.ru" lang="ru" xmltv_id="ExtremeSportsChannel.nl" site_id="213#extreme-sports-484">Extreme Sports Channel</channel>
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="FashionBox.nl" site_id="213#fashion-box-hd-1242">FashionBox HD</channel>
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="FashionOne.uk" site_id="213#fashion-one-732">Fashion One Europe</channel>
   <channel site="tv.yandex.ru" lang="ru" xmltv_id="FashionTV.ru" site_id="213#fashion-tv-152">FashionTV Russia</channel>
diff --git a/sites/tv24.se/tv24.se.channels.xml b/sites/tv24.se/tv24.se.channels.xml
index 9ec1af22..0a4c2f90 100644
--- a/sites/tv24.se/tv24.se.channels.xml
+++ b/sites/tv24.se/tv24.se.channels.xml
@@ -192,7 +192,7 @@
   <channel site="tv24.se" lang="sv" xmltv_id="ESTV.us" site_id="esportstv-hd">eSportsTV HD</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="Eurosport1.fr" site_id="eurosport-1">Eurosport 1</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="Eurosport2.fr" site_id="eurosport-2">Eurosport 2</channel>
-  <channel site="tv24.se" lang="sv" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
+  <channel site="tv24.se" lang="sv" xmltv_id="ExtremeSportsChannel.nl" site_id="extreme-sports-channel">Extreme Sports Channel</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="FashionTVEurope.fr" site_id="ftv-hd">FTV HD</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="France2.fr" site_id="france-2">France 2</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="France24French.fr" site_id="france-24">France 24</channel>
@@ -266,15 +266,15 @@
   <channel site="tv24.se" lang="sv" xmltv_id="TV2Zebra.no" site_id="tv-2-zebra">TV 2 Zebra</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV2Zulu.dk" site_id="tv2-zulu">TV2 Zulu</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV3.se" site_id="tv3">TV3</channel>
-  <channel site="tv24.se" lang="sv" xmltv_id="TV3Danmark.dk" site_id="tv3-1">TV3 Danmark</channel>
+  <channel site="tv24.se" lang="sv" xmltv_id="TV3.dk" site_id="tv3-1">TV3 Danmark</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV3Plus.dk" site_id="tv3-plus">TV3 Plus</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV3Sport.uk" site_id="tv3-sport">TV3 Sport</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV4.se" site_id="tv4">TV4</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV4Fakta.se" site_id="tv4-fakta">TV4 Fakta</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV4Film.se" site_id="tv4-film">TV4 Film</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TV4Guld.se" site_id="tv4-guld">TV4 Guld</channel>
-  <channel site="tv24.se" lang="sv" xmltv_id="TV6Sweden.se" site_id="tv6">TV6</channel>
-  <channel site="tv24.se" lang="sv" xmltv_id="TV8Sweden.se" site_id="tv8">TV8</channel>
+  <channel site="tv24.se" lang="sv" xmltv_id="TV6.se" site_id="tv6">TV6</channel>
+  <channel site="tv24.se" lang="sv" xmltv_id="TV8.se" site_id="tv8">TV8</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TVCGMNE.me" site_id="tvcg-sat">TVCG Sat</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TVChile.cl" site_id="tv-chile-internacional">TV Chile</channel>
   <channel site="tv24.se" lang="sv" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="tve-internacional">TVE Internacional</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 4bbc6520..39da5f85 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -32,7 +32,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BN2.ba" site_id="129">BN 2</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BoomerangCEE.us" site_id="2000000032">Boomerang</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BoomTV.si" site_id="124">Boom TV</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Brio.si" site_id="1000368">Brio</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="BRIO.si" site_id="1000368">Brio</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="CBSRealityEMEA.uk" site_id="44">CBS Reality</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="CGTN.cn" site_id="125">CGTN</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ChannelOne.ru" site_id="1000272">Perviy kanal</channel>
@@ -74,7 +74,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ExodusTV.si" site_id="1000455">Exodus TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="EXTASYTV.cz" site_id="1000682">Extasy 4K</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ExtremeHD.si" site_id="1000646">Extreme HD</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="37">Extreme Sports Channel</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ExtremeSportsChannel.nl" site_id="37">Extreme Sports Channel</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="FashionBox.nl" site_id="1000556">FashionBox HD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="FashionTVEurope.fr" site_id="1000056">FashionTV Europe</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="FastFunBox.nl" site_id="1000552">Fast &amp; FunBox HD</channel>
@@ -95,7 +95,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="FunBoxUHD.nl" site_id="1000521">FunBox UHD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Gametoon.nl" site_id="1000554">Gametoon</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="GeaTV.si" site_id="1000034">Gea TV</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="GoldTV.si" site_id="1000407">Gold TV</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="GOLDTV.si" site_id="1000407">Gold TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="GolicaTV.si" site_id="2000000056">Golica TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Happy.rs" site_id="1000209">Happy</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Hayat.ba" site_id="1000236">Hayat</channel>
@@ -119,7 +119,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVKCN1.rs" site_id="1000078">K CN 1</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVKCN2.rs" site_id="1000103">K CN 2</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVKCN3.rs" site_id="2000000046">K CN 3</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Kino.si" site_id="1000366">Kino</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="KINO.si" site_id="1000366">Kino</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Klasik.hr" site_id="1000154">Klasik TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="KoroskaTV.si" site_id="1000474">Koroška TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Legal.si" site_id="1000676">Legal HD</channel>
@@ -179,7 +179,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="PlanetTV.si" site_id="1000278">Planet TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="PlanetTV2.si" site_id="1000485">Planet TV 2</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="PlayHouseHD.si" site_id="1000294">Play House HD</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="PopTV.si" site_id="1000371">Pop TV</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="POPTV.si" site_id="1000371">Pop TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ProSieben.de" site_id="69">Pro 7</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Prva.rs" site_id="1000210">Prva Srpska TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Rai1.it" site_id="1000625">Rai 1</channel>
@@ -235,7 +235,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TrzicTV.si" site_id="1000620">Tržič TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="vijuTV1000.ru" site_id="1000010">TV1000</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TV24.mk" site_id="1000772">TV 24</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TV3Slovenia.si" site_id="1000510">TV 3</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TV3.si" site_id="1000510">TV 3</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TV8.si" site_id="1000405">TV 8</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVArena.si" site_id="1000529">TV Arena</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVAS.si" site_id="122">TV AS</channel>
@@ -257,7 +257,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVSLO3.si" site_id="1000555">TV Slovenija 3</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVSlonExtra.ba" site_id="1000776">TV Slon Extra</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="TVVijesti.me" site_id="1000775">TV Vijesti</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="VasKanal.si" site_id="1000002">Vaš Kanal</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Vaskanal.si" site_id="1000002">Vaš Kanal</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="VeseljakTV.si" site_id="13">Veseljak TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ViasatExplore.se" site_id="1000045">Viasat Explore HD</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ViasatHistory.se" site_id="1000046">Viasat History HD</channel>
diff --git a/sites/tvgids.nl/tvgids.nl.channels.xml b/sites/tvgids.nl/tvgids.nl.channels.xml
index d116ec2f..8276fa78 100644
--- a/sites/tvgids.nl/tvgids.nl.channels.xml
+++ b/sites/tvgids.nl/tvgids.nl.channels.xml
@@ -41,7 +41,7 @@
   <channel site="tvgids.nl" lang="nl" xmltv_id="ESPN.nl" site_id="espn">ESPN</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="Eurosport1.nl" site_id="eurosport1">Eurosport 1</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="Eurosport2.nl" site_id="eurosport2">Eurosport 2</channel>
-  <channel site="tvgids.nl" lang="nl" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="extsports">Extreme Sports Channel</channel>
+  <channel site="tvgids.nl" lang="nl" xmltv_id="ExtremeSportsChannel.nl" site_id="extsports">Extreme Sports Channel</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="Film1Action.nl" site_id="film1action">Film1 Action</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="Film1Drama.nl" site_id="film1drama">Film1 Drama</channel>
   <channel site="tvgids.nl" lang="nl" xmltv_id="Film1Family.nl" site_id="film1family">Film1 Family</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu.channels.xml
index dcf4a3a4..f0dd09f1 100644
--- a/sites/tvmusor.hu/tvmusor.hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu.channels.xml
@@ -12,7 +12,7 @@
   <channel site="tvmusor.hu" lang="hu" xmltv_id="BBCEarth.ro" site_id="251">BBC Earth</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="BoomerangCEE.us" site_id="77">Boomerang</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="CartoonNetwork.hu" site_id="91">Cartoon Network</channel>
-  <channel site="tvmusor.hu" lang="hu" xmltv_id="Cinemax.hu" site_id="47">Cinemax</channel>
+  <channel site="tvmusor.hu" lang="hu" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="47">Cinemax</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="ComedyCentralFamily.hu" site_id="316">Comedy Central Family</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="ComedyCentral.hu" site_id="194">Comedy Central</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="CoolTV.hu" site_id="79">Cool</channel>
@@ -37,9 +37,9 @@
   <channel site="tvmusor.hu" lang="hu" xmltv_id="FilmPlus.hu" site_id="32">Film+</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="FoodNetworkEMEA.us" site_id="285">Food Network</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="Hatoscsatorna.hu" site_id="246">Hatoscsatorna</channel>
-  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBO2.hu" site_id="59">HBO 2</channel>
-  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBO3.hu" site_id="143">HBO 3</channel>
-  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBO.hu" site_id="8">HBO</channel>
+  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBO2CentralEuropeHD.hu" site_id="59">HBO 2</channel>
+  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBO3CentralEuropeHD.hu" site_id="143">HBO 3</channel>
+  <channel site="tvmusor.hu" lang="hu" xmltv_id="HBOCentralEuropeHD.hu" site_id="8">HBO</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="HirTV.hu" site_id="10">Hír TV</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="HtMusicChannel.hu" site_id="253">H!t Music Channel</channel>
   <channel site="tvmusor.hu" lang="hu" xmltv_id="IzauraTV.hu" site_id="304">Izaura TV</channel>
diff --git a/sites/tvprofil.com/tvprofil.com.channels.xml b/sites/tvprofil.com/tvprofil.com.channels.xml
index 28fc6030..d56aa084 100644
--- a/sites/tvprofil.com/tvprofil.com.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com.channels.xml
@@ -39,9 +39,9 @@
   <channel site="tvprofil.com" lang="bg" xmltv_id="FilmBoxStars.bg" site_id="bg/tv-programa#filmbox-stars-bg">FilmBox Stars Adria</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="FolklorTV.bg" site_id="bg/tv-programa#folklor-tv-bg">Folklor TV</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="StarChannel.bg" site_id="bg/tv-programa#fox-bg">Fox Bulgaria</channel>
-  <channel site="tvprofil.com" lang="bg" xmltv_id="StarCrimeBulgaria.bg" site_id="bg/tv-programa#fox-crime-bg">Fox Crime Bulgaria</channel>
+  <channel site="tvprofil.com" lang="bg" xmltv_id="StarCrime.bg" site_id="bg/tv-programa#fox-crime-bg">Fox Crime Bulgaria</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="StarLife.bg" site_id="bg/tv-programa#fox-life-bg">Fox Life Bulgaria</channel>
-  <channel site="tvprofil.com" lang="bg" xmltv_id="HBOCEE.hu" site_id="bg/tv-programa#hbo-bg">HBO</channel>
+  <channel site="tvprofil.com" lang="bg" xmltv_id="HBOCentralEuropeHD.hu" site_id="bg/tv-programa#hbo-bg">HBO</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="HobbyTV.cz" site_id="bg/tv-programa#hobby-tv">Hobby TV</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="KinoNova.bg" site_id="bg/tv-programa#kino-nova">Kino Nova</channel>
   <channel site="tvprofil.com" lang="bg" xmltv_id="MagicTV.bg" site_id="bg/tv-programa#magic-tv-bg">Magic TV</channel>
@@ -143,7 +143,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="BoomerangCEE.us" site_id="al/programacioni#boomerang">Boomerang Central &amp; Eastern Europe</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BrainzTV.rs" site_id="ba/tvprogram#brainz-tv">Brainz TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BrazzersTVEurope.us" site_id="ba/tvprogram#private-spice">Brazzers TV</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="Brio.si" site_id="si/tvspored#pop-brio">Brio</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="BRIO.si" site_id="si/tvspored#pop-brio">Brio</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="Canale5.it" site_id="al/programacioni#canale-5">Canale 5</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="CBSRealityEMEA.uk" site_id="al/programacioni#cbs-reality">CBS Reality Europe</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="CGTNDocumentary.cn" site_id="ba/tvprogram#cgtn-documentary">CGTN Documentary</channel>
@@ -202,7 +202,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="ExplorerHistori.al" site_id="al/programacioni#explorer-histori">Explorer Histori</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ExplorerNatyra.al" site_id="al/programacioni#explorer-natyra">Explorer Natyra</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="ExplorerShkence.al" site_id="al/programacioni#explorer-shkence">Explorer Shkencë</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="al/programacioni#extreme-sports">Extreme Sports Channel</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="ExtremeSportsChannel.nl" site_id="al/programacioni#extreme-sports">Extreme Sports Channel</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="FACETV.ba" site_id="ba/tvprogram#face-tv">Face TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="FashionBox.nl" site_id="al/programacioni#fashionbox-hd">FashionBox HD</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="FashionTVEurope.fr" site_id="al/programacioni#fashion-tv">FashionTV Europe</channel>
@@ -248,7 +248,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="HayatMusic.ba" site_id="ba/tvprogram#hayat-music">Hayat Music</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="Hayatovci.ba" site_id="ba/tvprogram#hayatovci">Hayatovci</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="HayatPlus.ba" site_id="al/programacioni#hayat-plus">Hayat Plus</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="HBO.hu" site_id="hu/tvmusor#hbo-hu">HBO Hungary</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="HBOCentralEuropeHD.hu" site_id="hu/tvmusor#hbo-hu">HBO Hungary</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="HGTV.uk" site_id="ba/tvprogram#hgtv">HGTV UK</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="HirTV.hu" site_id="hu/tvmusor#hir-tv">Hír TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="History2.pl" site_id="ba/tvprogram#history-channel-2">History 2</channel>
@@ -275,7 +275,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="TVKCN1.rs" site_id="ba/tvprogram#kopernikus">K CN 1</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TVKCN2.rs" site_id="ba/tvprogram#k-cn-music">K CN 2</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TVKCN3.rs" site_id="ba/tvprogram#svet-plus">K CN 3</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="Kino.si" site_id="si/tvspored#pop-kino">Kino</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="KINO.si" site_id="si/tvspored#pop-kino">Kino</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="KinoTV.hr" site_id="ba/tvprogram#kinotv">Kino TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="KitchenTV.rs" site_id="ba/tvprogram#kitchentv">Kitchen TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="KlanKosova.xk" site_id="al/programacioni#klan-kosova">Klan Kosova</channel>
@@ -363,7 +363,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="PlanetEarth.bg" site_id="ba/tvprogram#planet-earth">Planet Earth</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="PlanetTV.si" site_id="tvprogram#planettv">Planet TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="PlayboyTVEurope.us" site_id="al/programacioni#playboy-tv">Playboy TV Europe</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="PopTV.si" site_id="tvprogram#pop-tv">Pop TV</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="POPTV.si" site_id="tvprogram#pop-tv">Pop TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="PowerTurkTV.tr" site_id="al/programacioni#powerturk-tv">Power Türk TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="PowerTV.tr" site_id="al/programacioni#power-tv">Power TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="Prime.hu" site_id="hu/tvmusor#prime">Prime</channel>
@@ -486,7 +486,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="TV2Comedy.hu" site_id="hu/tvmusor#tv2-comedy">TV2 Comedy</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TV2Kids.hu" site_id="hu/tvmusor#tv2-kids-hu">TV2 Kids</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TV2Sef.hu" site_id="hu/tvmusor#tv2-sef">TV2 Séf</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="TV3Slovenia.si" site_id="tvprogram#tv3-medias">TV 3</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="TV3.si" site_id="tvprogram#tv3-medias">TV 3</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TV4.hu" site_id="hu/tvmusor#tv4-hu">TV4</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="TVArena.si" site_id="si/tvspored#tv-arena">TV Arena</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="BelleAmie.rs" site_id="rs/tvprogram#belle-amie">TV Belle Amie</channel>
diff --git a/sites/vivacom.bg/vivacom.bg.channels.xml b/sites/vivacom.bg/vivacom.bg.channels.xml
index 6d32e1a0..1c4db3f4 100644
--- a/sites/vivacom.bg/vivacom.bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg.channels.xml
@@ -28,8 +28,8 @@
   <channel site="vivacom.bg" lang="bg" xmltv_id="BSTV.bg" site_id="9#БСТВ">Bulgarska Svobodna TV</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="CartoonNetwork.bg" site_id="8#Cartoon Network">Cartoon Network</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="CBSRealityEMEA.uk" site_id="16#CBS Reality">CBS Reality</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="Cinemax2.bg" site_id="19#Cinemax 2">Cinemax 2</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="Cinemax.bg" site_id="18#Cinemax">Cinemax</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="Cinemax2CentralEuropeHD.hu" site_id="19#Cinemax 2">Cinemax 2</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="CinemaxCentralEuropeHD.hu" site_id="18#Cinemax">Cinemax</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="CrimePlusInvestigation.uk" site_id="16#CI Network">Crime + Investigation</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="DaVinci.de" site_id="8#Da Vinci Learning ">Da Vinci</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="DeluxeLounge.de" site_id="14#Deluxe Lounge HD">Deluxe Lounge</channel>
@@ -58,12 +58,12 @@
   <channel site="vivacom.bg" lang="bg" xmltv_id="FolklorTV.bg" site_id="12#Фолклор ТВ">Folklor TV</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="FoodNetworkEMEA.us" site_id="19#Food Network">Food Network</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="StarChannel.bg" site_id="2#Fox HD">Fox HD</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="StarCrimeBulgaria.bg" site_id="5#Fox Crime">Fox Crime</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="StarCrime.bg" site_id="5#Fox Crime">Fox Crime</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="StarLife.bg" site_id="5#Fox Life">Fox Life</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="France24French.fr" site_id="11#France 24">France 24</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="HBO2CEE.hu" site_id="18#HBO 2">HBO 2</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="HBO3CEE.hu" site_id="18#HBO 3">HBO 3</channel>
-  <channel site="vivacom.bg" lang="bg" xmltv_id="HBOCEE.hu" site_id="18#HBO">HBO</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="HBO2CentralEurope.hu" site_id="18#HBO 2">HBO 2</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="HBO3CentralEurope.hu" site_id="18#HBO 3">HBO 3</channel>
+  <channel site="vivacom.bg" lang="bg" xmltv_id="HBOCentralEuropeHD.hu" site_id="18#HBO">HBO</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="HitMixMusic.bg" site_id="12#Hit Mix">Hit Mix Channel</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="HustlerTVEurope.nl" site_id="22#Hustler">Hustler TV</channel>
   <channel site="vivacom.bg" lang="bg" xmltv_id="InvestigationDiscoveryEurope.us" site_id="19#Investigation Discovery">Investigation Discovery</channel>
@@ -131,7 +131,7 @@
   <channel site="vivacom.bg" lang="en" xmltv_id="EnglishClubTV.uk" site_id="9#English Club TV">English Club TV</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="Eurochannel.uk" site_id="7#Eurochannel">Eurochannel</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="9#Euronews HD">EuroNews HD</channel>
-  <channel site="vivacom.bg" lang="en" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="3#Extreme Sports">Extreme Sports Channel</channel>
+  <channel site="vivacom.bg" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="3#Extreme Sports">Extreme Sports Channel</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="FashionBox.nl" site_id="16#FashionBox HD ">FashionBox HD</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="FastFunBox.nl" site_id="4#Fast and Fun ">Fast &amp; FunBox</channel>
   <channel site="vivacom.bg" lang="en" xmltv_id="FightBox.nl" site_id="4#Fight Box ">FightBox HD</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv.channels.xml b/sites/ziggogo.tv/ziggogo.tv.channels.xml
index bdb5a7b9..ab657fc9 100644
--- a/sites/ziggogo.tv/ziggogo.tv.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv.channels.xml
@@ -58,7 +58,7 @@
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Eurosport1.fr" site_id="NL_000020_019432">Eurosport 1</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Eurosport2.fr" site_id="NL_000103_019581">Eurosport 2</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="EvilAngelTV.us" site_id="NL_000172_019302">Evil Angel TV</channel>
-  <channel site="ziggogo.tv" lang="nl" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="NL_000104_019292">Extreme Sports Channel</channel>
+  <channel site="ziggogo.tv" lang="nl" xmltv_id="ExtremeSportsChannel.nl" site_id="NL_000104_019292">Extreme Sports Channel</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Family7.nl" site_id="NL_000081_020051">Family7</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Film1Action.nl" site_id="NL_000053_019653">Film 1 Action</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Film1Drama.nl" site_id="NL_000055_019645">Film 1 Drama</channel>