diff --git a/sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml b/sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml
index c9835381..bceef930 100644
--- a/sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml
+++ b/sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml
@@ -41,13 +41,12 @@
     <channel lang="mk" xmltv_id="SitelTV.mk" site_id="13">Sitel TV</channel>
     <channel lang="mk" xmltv_id="Telma.mk" site_id="36">Telma</channel>
     <channel lang="mk" xmltv_id="TeraTV.mk" site_id="92">Tera TV</channel>
-    <channel lang="mk" xmltv_id="TringAction.al" site_id="124">Tring Action</channel>
+    <channel lang="mk" xmltv_id="TringActionHD.al" site_id="124">Tring Action</channel>
     <channel lang="mk" xmltv_id="TringFantasy.al" site_id="126">Tring Fantasy</channel>
     <channel lang="mk" xmltv_id="TV24.mk" site_id="29">TV 24</channel>
     <channel lang="mk" xmltv_id="TV1000Balkan.se" site_id="96">TV 1000 Balkan</channel>
     <channel lang="mk" xmltv_id="TVEdo.mk" site_id="76">TV Edo</channel>
     <channel lang="mk" xmltv_id="TVIris.mk" site_id="94">TV Iris</channel>
-    <channel lang="mk" xmltv_id="TVKoha.mk" site_id="37">TV Koha</channel>
     <channel lang="mk" xmltv_id="TVShenja.mk" site_id="80">TV Shenja</channel>
     <channel lang="mk" xmltv_id="TVSonce.mk" site_id="40">TV Sonce</channel>
     <channel lang="mk" xmltv_id="ViasatExploreEast.se" site_id="123">Viasat Explore East</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index 7128a0c1..a2cc6eb5 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -555,7 +555,7 @@
     <channel lang="sq" xmltv_id="FaxNews.al" site_id="1895">Fax News</channel>
     <channel lang="sq" xmltv_id="FirstChannel.rs" site_id="1688">First Channel</channel>
     <channel lang="sq" xmltv_id="Kohavision.rs" site_id="234">Kohavision</channel>
-    <channel lang="sq" xmltv_id="Ora.al" site_id="1878">Ora</channel>
+    <channel lang="sq" xmltv_id="OraTV.al" site_id="1878">Ora</channel>
     <channel lang="sq" xmltv_id="RTK1.xk" site_id="358">RTK 1</channel>
     <channel lang="sq" xmltv_id="RTSH3.al" site_id="1681">RTSH 3</channel>
     <channel lang="sq" xmltv_id="RTV21Sat.rs" site_id="370">RTV 21 Sat</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index c920fd7c..ee9b094a 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -233,7 +233,7 @@
     <channel lang="sl" xmltv_id="TravelChannelEurope.us" site_id="1000168">Travel Channel Europe</channel>
     <channel lang="sl" xmltv_id="Travelxp4KEurope.in" site_id="1000511">Travelxp 4K Europe</channel>
     <channel lang="sl" xmltv_id="TravelxpHDEurope.in" site_id="1000500">Travelxp HD Europe</channel>
-    <channel lang="sl" xmltv_id="TringAction.al" site_id="1000227">Tring Action</channel>
+    <channel lang="sl" xmltv_id="TringActionHD.al" site_id="1000227">Tring Action</channel>
     <channel lang="sl" xmltv_id="TringShqip.al" site_id="1000216">Tring Shqip</channel>
     <channel lang="sl" xmltv_id="TringTring.al" site_id="1000217">Tring Tring</channel>
     <channel lang="sl" xmltv_id="TrzicTV.si" site_id="1000620">Tržič TV</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_al.channels.xml b/sites/tvprofil.com/tvprofil.com_al.channels.xml
index 1b3e7c6c..874f0b97 100644
--- a/sites/tvprofil.com/tvprofil.com_al.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_al.channels.xml
@@ -119,8 +119,8 @@
     <channel lang="hr" xmltv_id="RTK1.xk" site_id="al/programacioni#rtk-1">RTK 1</channel>
     <channel lang="hr" xmltv_id="RTNews.ru" site_id="al/programacioni#russia-today">RT News</channel>
     <channel lang="hr" xmltv_id="RTS1.rs" site_id="al/programacioni#rts1">RTS 1</channel>
-    <channel lang="hr" xmltv_id="RTSH1.al" site_id="al/programacioni#rtsh">RTSH 1</channel>
-    <channel lang="hr" xmltv_id="RTSH1Sat.al" site_id="al/programacioni#rtsh-sat">RTSH 1 Sat</channel>
+    <channel lang="hr" xmltv_id="RTSH1HD.al" site_id="al/programacioni#rtsh">RTSH 1</channel>
+    <channel lang="hr" xmltv_id="RTSHSatelit.al" site_id="al/programacioni#rtsh-sat">RTSH 1 Sat</channel>
     <channel lang="hr" xmltv_id="RTSH24.al" site_id="al/programacioni#rtsh-24">RTSH 24</channel>
     <channel lang="hr" xmltv_id="RTSH3.al" site_id="al/programacioni#rtsh-3">RTSH 3</channel>
     <channel lang="hr" xmltv_id="RTSHPlus.al" site_id="al/programacioni#rtsh-plus">RTSH Plus</channel>
@@ -141,24 +141,24 @@
     <channel lang="hr" xmltv_id="TopChannel.al" site_id="al/programacioni#top-channel">Top Channel</channel>
     <channel lang="hr" xmltv_id="TopNews.al" site_id="al/programacioni#top-news">Top News</channel>
     <channel lang="hr" xmltv_id="TravelChannelEurope.us" site_id="al/programacioni#travel-channel">Travel Channel Europe</channel>
-    <channel lang="hr" xmltv_id="TringAction.al" site_id="al/programacioni#tring-max">Tring Action</channel>
-    <channel lang="hr" xmltv_id="TringClassic.al" site_id="al/programacioni#tring-classic">Tring Classic</channel>
+    <channel lang="hr" xmltv_id="TringActionHD.al" site_id="al/programacioni#tring-max">Tring Action</channel>
+    <channel lang="hr" xmltv_id="TringClassicHD.al" site_id="al/programacioni#tring-classic">Tring Classic</channel>
     <channel lang="hr" xmltv_id="TringComedy.al" site_id="al/programacioni#tring-comedy">Tring Comedy</channel>
     <channel lang="hr" xmltv_id="TringFamily.al" site_id="al/programacioni#tring-family">Tring Family</channel>
     <channel lang="hr" xmltv_id="TringFantasy.al" site_id="al/programacioni#tring-fantasy">Tring Fantasy</channel>
     <channel lang="hr" xmltv_id="TringHistory.al" site_id="al/programacioni#tring-history">Tring History</channel>
     <channel lang="hr" xmltv_id="TringInternational.al" site_id="al/programacioni#tring-international">Tring International</channel>
-    <channel lang="hr" xmltv_id="TringJolly.al" site_id="al/programacioni#jolly-hd">Tring Jolly</channel>
+    <channel lang="hr" xmltv_id="TringJollyHD.al" site_id="al/programacioni#jolly-hd">Tring Jolly HD</channel>
     <channel lang="hr" xmltv_id="TringKids.al" site_id="al/programacioni#tring-kids">Tring Kids</channel>
     <channel lang="hr" xmltv_id="TringLife.al" site_id="al/programacioni#tring-life">Tring Life</channel>
     <channel lang="hr" xmltv_id="TringPlanet.al" site_id="al/programacioni#tring-planet">Tring Planet</channel>
     <channel lang="hr" xmltv_id="TringShqip.al" site_id="al/programacioni#tring-shqip">Tring Shqip</channel>
-    <channel lang="hr" xmltv_id="TringSmile.al" site_id="al/programacioni#smile">Tring Smile</channel>
-    <channel lang="hr" xmltv_id="TringSport1.al" site_id="al/programacioni#tring-sport-1-hd">Tring Sport 1</channel>
-    <channel lang="hr" xmltv_id="TringSport2.al" site_id="al/programacioni#tring-sport-2-hd">Tring Sport 2</channel>
-    <channel lang="hr" xmltv_id="TringSport3.al" site_id="al/programacioni#tring-sport-3-hd">Tring Sport 3</channel>
-    <channel lang="hr" xmltv_id="TringSportNews.al" site_id="al/programacioni#sport-news-hd">Tring Sport News</channel>
-    <channel lang="hr" xmltv_id="TringSuper.al" site_id="al/programacioni#tring-super">Tring Super</channel>
+    <channel lang="hr" xmltv_id="Smile.al" site_id="al/programacioni#smile">Smile</channel>
+    <channel lang="hr" xmltv_id="TringSport1HD.al" site_id="al/programacioni#tring-sport-1-hd">Tring Sport 1</channel>
+    <channel lang="hr" xmltv_id="TringSport2HD.al" site_id="al/programacioni#tring-sport-2-hd">Tring Sport 2</channel>
+    <channel lang="hr" xmltv_id="TringSport3HD.al" site_id="al/programacioni#tring-sport-3-hd">Tring Sport 3</channel>
+    <channel lang="hr" xmltv_id="TringSportNewsHD.al" site_id="al/programacioni#sport-news-hd">Tring Sport News</channel>
+    <channel lang="hr" xmltv_id="TringSuperHD.al" site_id="al/programacioni#tring-super">Tring Super</channel>
     <channel lang="hr" xmltv_id="TringTring.al" site_id="al/programacioni#tring-tring">Tring Tring</channel>
     <channel lang="hr" xmltv_id="TringWorld.al" site_id="al/programacioni#tring-world">Tring World</channel>
     <channel lang="hr" xmltv_id="TRT1.tr" site_id="al/programacioni#trt-1">TRT 1</channel>