diff --git a/sites/cosmote.gr.channels.xml b/sites/cosmote.gr.channels.xml
index ffe103e3..dc141fe3 100755
--- a/sites/cosmote.gr.channels.xml
+++ b/sites/cosmote.gr.channels.xml
@@ -2,13 +2,13 @@
 <site site="cosmote.gr">
   <channels>
     <channel site_id="4e" xmltv_id="4E.gr">4Ε</channel>
-    <channel site_id="ant1" xmltv_id="ANT1TVHD.gr">ANT1 TV HD</channel>
+    <channel site_id="ant1" xmltv_id="Ant1.gr">ANT1</channel>
     <channel site_id="action-1" xmltv_id="Action24.gr">Action 24</channel>
     <channel site_id="al-arabiya" xmltv_id="AlArabiya.ae">Al Arabiya</channel>
     <channel site_id="al-jazeera" xmltv_id="AlJazeeraEnglish.qa">Al Jazeera English</channel>
-    <channel site_id="alpha" xmltv_id="AlphaTVHD.gr">Alpha TV HD</channel>
+    <channel site_id="alpha" xmltv_id="AlphaTV.gr">Alpha TV</channel>
     <channel site_id="alert" xmltv_id="AtlasTV.gr">Atlas TV</channel>
-    <channel site_id="bbc-earth-hd" xmltv_id="BBCEarthHDGreece.uk">BBC Earth HD Greece</channel>
+    <channel site_id="bbc-earth-hd" xmltv_id="BBCEarthGreece.uk">BBC Earth Greece</channel>
     <channel site_id="bbc-world-news" xmltv_id="BBCWorldNewsEurope.uk">BBC World News Europe</channel>
     <channel site_id="baby-tv" xmltv_id="BabyTVEurope.uk">BabyTV Europe</channel>
     <channel site_id="bloomberg" xmltv_id="BloombergTVEurope.us">Bloomberg TV Europe</channel>
@@ -17,80 +17,80 @@
     <channel site_id="cbs-reality" xmltv_id="CBSRealityEurope.us">CBS Reality Europe</channel>
     <channel site_id="cnbc" xmltv_id="CNBCEurope.us">CNBC Europe</channel>
     <channel site_id="cnn" xmltv_id="CNNInternationalEurope.us">CNN International Europe</channel>
-    <channel site_id="ote-cinema-1" xmltv_id="CosmoteCinema1HD.gr">Cosmote Cinema 1 HD</channel>
-    <channel site_id="ote-cinema-2-hd" xmltv_id="CosmoteCinema2HD.gr">Cosmote Cinema 2 HD</channel>
+    <channel site_id="ote-cinema-1" xmltv_id="CosmoteCinema1.gr">Cosmote Cinema 1</channel>
+    <channel site_id="ote-cinema-2-hd" xmltv_id="CosmoteCinema2.gr">Cosmote Cinema 2</channel>
     <channel site_id="ote-cinema-3" xmltv_id="CosmoteCinema3.gr">Cosmote Cinema 3</channel>
-    <channel site_id="cosmote-cinema-oscars-hd" xmltv_id="CosmoteCinemaOscarsHD.gr">Cosmote Cinema Oscars HD</channel>
-    <channel site_id="ote-history" xmltv_id="CosmoteHistoryHD.gr">Cosmote History HD</channel>
-    <channel site_id="ote-cinema-4" xmltv_id="CosmoteSeriesHD.gr">Cosmote Series HD</channel>
+    <channel site_id="cosmote-cinema-oscars-hd" xmltv_id="CosmoteCinemaOscars.gr">Cosmote Cinema Oscars</channel>
+    <channel site_id="ote-history" xmltv_id="CosmoteHistory.gr">Cosmote History</channel>
+    <channel site_id="ote-cinema-4" xmltv_id="CosmoteSeries.gr">Cosmote Series</channel>
     <channel site_id="cosmote-series-marath-1" xmltv_id="CosmoteSeriesMarathon.gr">Cosmote Series Marathon</channel>
-    <channel site_id="ote-sport-1-hd" xmltv_id="CosmoteSport1HD.gr">Cosmote Sport 1 HD</channel>
-    <channel site_id="ote-sport-2-hd" xmltv_id="CosmoteSport2HD.gr">Cosmote Sport 2 HD</channel>
-    <channel site_id="ote-sport-3-hd" xmltv_id="CosmoteSport3HD.gr">Cosmote Sport 3 HD</channel>
-    <channel site_id="ote-sport-4-hd" xmltv_id="CosmoteSport4HD.gr">Cosmote Sport 4 HD</channel>
-    <channel site_id="ote-sport-5-hd" xmltv_id="CosmoteSport5HD.gr">Cosmote Sport 5 HD</channel>
-    <channel site_id="ote-sport-6-hd" xmltv_id="CosmoteSport6HD.gr">Cosmote Sport 6 HD</channel>
-    <channel site_id="ote-sport-7-hd" xmltv_id="CosmoteSport7HD.gr">Cosmote Sport 7 HD</channel>
-    <channel site_id="ote-sport-8-hd" xmltv_id="CosmoteSport8HD.gr">Cosmote Sport 8 HD</channel>
-    <channel site_id="cosmotesport9hd" xmltv_id="CosmoteSport9HD.gr">Cosmote Sport 9 HD</channel>
-    <channel site_id="ote-sport-highlights-hd" xmltv_id="CosmoteSportHighlightsHD.gr">Cosmote Sport Highlights HD</channel>
+    <channel site_id="ote-sport-1-hd" xmltv_id="CosmoteSport1.gr">Cosmote Sport 1</channel>
+    <channel site_id="ote-sport-2-hd" xmltv_id="CosmoteSport2.gr">Cosmote Sport 2</channel>
+    <channel site_id="ote-sport-3-hd" xmltv_id="CosmoteSport3.gr">Cosmote Sport 3</channel>
+    <channel site_id="ote-sport-4-hd" xmltv_id="CosmoteSport4.gr">Cosmote Sport 4</channel>
+    <channel site_id="ote-sport-5-hd" xmltv_id="CosmoteSport5.gr">Cosmote Sport 5</channel>
+    <channel site_id="ote-sport-6-hd" xmltv_id="CosmoteSport6.gr">Cosmote Sport 6</channel>
+    <channel site_id="ote-sport-7-hd" xmltv_id="CosmoteSport7.gr">Cosmote Sport 7</channel>
+    <channel site_id="ote-sport-8-hd" xmltv_id="CosmoteSport8.gr">Cosmote Sport 8</channel>
+    <channel site_id="cosmotesport9hd" xmltv_id="CosmoteSport9.gr">Cosmote Sport 9</channel>
+    <channel site_id="ote-sport-highlights-hd" xmltv_id="CosmoteSportHighlights.gr">Cosmote Sport Highlights</channel>
     <channel site_id="crime-and-investigation" xmltv_id="CrimeInvestigationUK.us">Crime &amp; Investigation UK</channel>
     <channel site_id="deutsche-welle" xmltv_id="DWEnglish.de">DW English</channel>
     <channel site_id="disney-channel" xmltv_id="DisneyChannelMiddleEast.us">Disney Channel Middle East</channel>
     <channel site_id="disney-junior" xmltv_id="DisneyJuniorGreece.us">Disney Junior Greece</channel>
-    <channel site_id="e-hd" xmltv_id="EHDEurope.us">E! HD Europe</channel>
-    <channel site_id="edgesport-hd" xmltv_id="EDGEsportHD.uk">EDGEsport HD</channel>
+    <channel site_id="e-hd" xmltv_id="EEurope.us">E! Europe</channel>
+    <channel site_id="edgesport-hd" xmltv_id="EDGEsport.uk">EDGEsport</channel>
     <channel site_id="tv100" xmltv_id="ENAChannel.gr">ENA Channel</channel>
     <channel site_id="ert-world" xmltv_id="ERTWorld.gr">ERT World</channel>
     <channel site_id="zoom-tv" xmltv_id="EpsilonTV.gr">Epsilon TV</channel>
     <channel site_id="euronews-english" xmltv_id="EuronewsEnglish.fr">Euronews English</channel>
     <channel site_id="euronews" xmltv_id="Euronewsellinika.fr">Euronews ελληνικά</channel>
-    <channel site_id="fashion-tv" xmltv_id="FashionTVHDEurope.fr">FashionTV HD Europe</channel>
-    <channel site_id="fox-hd" xmltv_id="FoxHDGreece.us">Fox HD Greece</channel>
-    <channel site_id="foxlife-hd" xmltv_id="FoxLifeHDGreece.us">Fox Life HD Greece</channel>
+    <channel site_id="fashion-tv" xmltv_id="FashionTVEurope.fr">FashionTV Europe</channel>
+    <channel site_id="fox-hd" xmltv_id="FoxGreece.us">Fox Greece</channel>
+    <channel site_id="foxlife-hd" xmltv_id="FoxLifeGreece.us">Fox Life Greece</channel>
     <channel site_id="france-24-en" xmltv_id="France24English.fr">France 24 English</channel>
     <channel site_id="france-24-fr" xmltv_id="France24Francais.fr">France 24 Français</channel>
     <channel site_id="ginx-esports" xmltv_id="GinxeSportsTVGreece.uk">Ginx eSports TV Greece</channel>
     <channel site_id="hustler-tv-hd" xmltv_id="HustlerHDEurope.us">Hustler HD Europe</channel>
-    <channel site_id="luxe-tv-hd" xmltv_id="LuxeTVHD.lu">Luxe TV HD</channel>
+    <channel site_id="luxe-tv-hd" xmltv_id="LuxeTV.lu">Luxe TV</channel>
     <channel site_id="mtv-europe" xmltv_id="MTVEurope.us">MTV Europe</channel>
     <channel site_id="mtv-live-hd" xmltv_id="MTVLiveHD.us">MTV Live HD</channel>
     <channel site_id="mad" xmltv_id="MadTV.gr">Mad TV</channel>
-    <channel site_id="mad-hits" xmltv_id="MadViralHD.gr">Mad Viral HD</channel>
-    <channel site_id="mega-hd" xmltv_id="MegaTVHD.gr">Mega TV HD</channel>
+    <channel site_id="mad-hits" xmltv_id="MadViral.gr">Mad Viral</channel>
+    <channel site_id="mega-hd" xmltv_id="MegaTV.gr">Mega TV</channel>
     <channel site_id="mezzo" xmltv_id="MezzoLiveHD.fr">Mezzo Live HD</channel>
-    <channel site_id="motorvision-channel-hd" xmltv_id="MotorvisionTVHD.de">Motorvision TV HD</channel>
-    <channel site_id="nat-geo-wild-hd" xmltv_id="NationalGeographicWildHDEurope.us">National Geographic Wild HD Europe</channel>
-    <channel site_id="national-geographic" xmltv_id="NationalGeographicHDGreece.us">National Geographic HD Greece</channel>
-    <channel site_id="nautical-channel-hd" xmltv_id="NauticalChannelHD.it">Nautical Channel HD</channel>
-    <channel site_id="nickelodeon-hd" xmltv_id="NickelodeonHDGreece.us">Nickelodeon HD Greece</channel>
-    <channel site_id="one-channel" xmltv_id="OneChannelHD.gr">One Channel HD</channel>
-    <channel site_id="epsilon-tv" xmltv_id="OpenBeyondHD.gr">Open Beyond HD</channel>
-    <channel site_id="outdoor-channel-hd" xmltv_id="OutdoorChannelHD.us">Outdoor Channel HD</channel>
+    <channel site_id="motorvision-channel-hd" xmltv_id="MotorvisionTV.de">Motorvision TV</channel>
+    <channel site_id="nat-geo-wild-hd" xmltv_id="NationalGeographicWildEurope.us">National Geographic Wild Europe</channel>
+    <channel site_id="national-geographic" xmltv_id="NationalGeographicEllada.us">National Geographic Ellada</channel>
+    <channel site_id="nautical-channel-hd" xmltv_id="NauticalChannel.it">Nautical Channel</channel>
+    <channel site_id="nickelodeon-hd" xmltv_id="NickelodeonGreece.us">Nickelodeon Greece</channel>
+    <channel site_id="one-channel" xmltv_id="OneChannel.gr">One Channel</channel>
+    <channel site_id="epsilon-tv" xmltv_id="OpenTV.gr">Open TV</channel>
+    <channel site_id="outdoor-channel-hd" xmltv_id="OutdoorChannel.us">Outdoor Channel</channel>
     <channel site_id="penthouse-hd1" xmltv_id="PenthouseGold.us">Penthouse Gold</channel>
     <channel site_id="private-tv" xmltv_id="PrivateTV.nl">Private TV</channel>
     <channel site_id="russia-today" xmltv_id="RT.ru">RT</channel>
     <channel site_id="sirina-tv" xmltv_id="SirinaTV.gr">Sirina TV</channel>
     <channel site_id="smile-tv" xmltv_id="SmileTV.gr">Smile TV</channel>
-    <channel site_id="star" xmltv_id="StarTVHD.gr">Star TV HD</channel>
+    <channel site_id="star" xmltv_id="StarChannel.gr">Star Channel</channel>
     <channel site_id="star-kentrikes-elladas" xmltv_id="StarKentrikisElladas.gr">Star Κεντρικής Ελλάδας</channel>
     <channel site_id="c-music-tv" xmltv_id="StingrayCMusic.ca">Stingray CMusic</channel>
     <channel site_id="iconcerts-hd" xmltv_id="StingrayiConcerts.ca">Stingray iConcerts</channel>
-    <channel site_id="tcm" xmltv_id="TCMHDCentralEasternEurope.us">TCM HD Central &amp; Eastern Europe</channel>
+    <channel site_id="tcm" xmltv_id="TCMCentralEasternEurope.us">TCM Central &amp; Eastern Europe</channel>
     <channel site_id="vh1" xmltv_id="VH1Europe.us">VH1 Europe</channel>
-    <channel site_id="viasat-explo-1" xmltv_id="ViasatExploreHDEast.se">Viasat Explore HD East</channel>
-    <channel site_id="viasat-history" xmltv_id="ViasatHistoryHD.se">Viasat History HD</channel>
-    <channel site_id="viasat-natu-1" xmltv_id="ViasatNatureHDEast.se">Viasat Nature HD East</channel>
-    <channel site_id="village-cinema-hd" xmltv_id="VillageCinemasHD.gr">Village Cinemas HD</channel>
+    <channel site_id="viasat-explo-1" xmltv_id="ViasatExploreEast.se">Viasat Explore East</channel>
+    <channel site_id="viasat-history" xmltv_id="ViasatHistory.se">Viasat History</channel>
+    <channel site_id="viasat-natu-1" xmltv_id="ViasatNatureEast.se">Viasat Nature East</channel>
+    <channel site_id="village-cinema-hd" xmltv_id="VillageCinemas.gr">Village Cinemas</channel>
     <channel site_id="aigaio-tv" xmltv_id="AigaioTV.gr">Αιγαίο TV</channel>
     <channel site_id="epeiros-tv1" xmltv_id="VerginaTV.gr">Βεργίνα TV</channel>
     <channel site_id="boule" xmltv_id="Voyli.gr">Βουλή</channel>
-    <channel site_id="ert1" xmltv_id="ERT1HD.gr">ΕΡΤ1 HD</channel>
-    <channel site_id="ert2" xmltv_id="ERT2HD.gr">ΕΡΤ2 HD</channel>
-    <channel site_id="ert3" xmltv_id="ERT3HD.gr">ΕΡΤ3 HD</channel>
+    <channel site_id="ert1" xmltv_id="ERT1.gr">ΕΡΤ1</channel>
+    <channel site_id="ert2" xmltv_id="ERT2.gr">ΕΡΤ2</channel>
+    <channel site_id="ert3" xmltv_id="ERT3.gr">ΕΡΤ3</channel>
     <channel site_id="krete-tv" xmltv_id="KritiTV.gr">Κρήτη TV</channel>
-    <channel site_id="makedonia-tv" xmltv_id="MakedoniaTVHD.gr">Μακεδονία TV HD</channel>
+    <channel site_id="makedonia-tv" xmltv_id="MakedoniaTV.gr">Μακεδονία TV</channel>
     <channel site_id="nea-teleorase-kretes" xmltv_id="NeaTileorasiKritis.gr">Νέα Τηλεόραση Κρήτης</channel>
-    <channel site_id="skai" xmltv_id="SKAIHD.gr">ΣΚΑΪ HD</channel>
+    <channel site_id="skai" xmltv_id="SKAI.gr">ΣΚΑΪ</channel>
   </channels>
 </site>
\ No newline at end of file