diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index ed4d5135..6e5383ea 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -84,7 +84,7 @@
     <channel lang="en" xmltv_id="BigTenNetworkOverflow3.us" site_id="71200">Big Ten Network Overflow 3</channel>
     <channel lang="en" xmltv_id="BigTenNetworkOverflow4.us" site_id="71202">Big Ten Network Overflow 4</channel>
     <channel lang="en" xmltv_id="Blaze.us" site_id="11549">Blaze</channel>
-    <channel lang="en" xmltv_id="BloombergTV.us" site_id="71799">Bloomberg TV</channel>
+    <channel lang="en" xmltv_id="BloombergTelevision.us" site_id="71799">Bloomberg Television</channel>
     <channel lang="en" xmltv_id="Boomerang.us" site_id="21883">Boomerang</channel>
     <channel lang="en" xmltv_id="Bounce.us" site_id="73067">Bounce</channel>
     <channel lang="en" xmltv_id="BravoEast.us" site_id="10057">Bravo East</channel>
@@ -97,16 +97,13 @@
     <channel lang="en" xmltv_id="CartoonNetworkEast.us" site_id="60048">Cartoon Network East</channel>
     <channel lang="en" xmltv_id="CartoonNetworkWest.us" site_id="18151">Cartoon Network West</channel>
     <channel lang="en" xmltv_id="CatholicFaithNetwork.us" site_id="62900">Catholic Faith Network</channel>
-    <channel lang="en" xmltv_id="CBHTDT.ca" site_id="14724">CBHT</channel>
     <channel lang="en" xmltv_id="CBSEast.us" site_id="10098">CBS East</channel>
     <channel lang="en" xmltv_id="CBSNews.us" site_id="104846">CBS News Live</channel>
     <channel lang="en" xmltv_id="CBSSportsNetworkUSA.us" site_id="59250">CBS Sports Network</channel>
     <channel lang="en" xmltv_id="CentroamericaTV.us" site_id="44448">CentroAmérica TV</channel>
-    <channel lang="en" xmltv_id="CFTODT.ca" site_id="10108">CFTO</channel>
     <channel lang="en" xmltv_id="CGTNAmerica.cn" site_id="29114">CGTN America</channel>
     <channel lang="en" xmltv_id="ChannelI.bd" site_id="14202">Channel i</channel>
     <channel lang="en" xmltv_id="Charge.us" site_id="102148">Charge!</channel>
-    <channel lang="en" xmltv_id="CHCHDT1.ca" site_id="60123">CHCH (CHCH-DT1) Ontario Canada</channel>
     <channel lang="en" xmltv_id="Cheddar.us" site_id="109333">Cheddar News</channel>
     <channel lang="en" xmltv_id="CineEstelar.us" site_id="62125">Cine Estelar</channel>
     <channel lang="en" xmltv_id="CinemaxEast.us" site_id="10120">Cinemax East</channel>
@@ -141,7 +138,7 @@
     <channel lang="en" xmltv_id="Dabl.us" site_id="112157">Dabl</channel>
     <channel lang="en" xmltv_id="DaystarTV.us" site_id="19026">Daystar TV</channel>
     <channel lang="en" xmltv_id="Decades.us" site_id="91415">Decades</channel>
-    <channel lang="en" xmltv_id="DePelicula.mx" site_id="35401">De Pelicula</channel>
+    <channel lang="en" xmltv_id="DePeliculaUS.mx" site_id="35401">De Pelicula</channel>
     <channel lang="en" xmltv_id="DePeliculaClasico.mx" site_id="33628">De Pelicula Clasico</channel>
     <channel lang="en" xmltv_id="DestinationAmerica.us" site_id="16617">Destination America</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelEast.us" site_id="56905">Discovery Channel East</channel>
@@ -149,7 +146,7 @@
     <channel lang="en" xmltv_id="DiscoveryenEspanol.us" site_id="19247">Discovery Channel en Español</channel>
     <channel lang="en" xmltv_id="DiscoveryFamilia.us" site_id="99630">Discovery Familia</channel>
     <channel lang="en" xmltv_id="DiscoveryFamily.us" site_id="16618">Discovery Family</channel>
-    <channel lang="en" xmltv_id="DiscoveryLifeChannel.us" site_id="16125">Discovery Life Channel</channel>
+    <channel lang="en" xmltv_id="DiscoveryLife.us" site_id="16125">Discovery Life</channel>
     <channel lang="en" xmltv_id="DisneyChannelEast.us" site_id="10171">Disney Channel East</channel>
     <channel lang="en" xmltv_id="DisneyChannelWest.us" site_id="12510">Disney Channel West</channel>
     <channel lang="en" xmltv_id="DisneyJuniorEast.us" site_id="74796">Disney Junior East</channel>
@@ -174,8 +171,6 @@
     <channel lang="en" xmltv_id="EsperanzaTV.us" site_id="65095">Esperanza TV</channel>
     <channel lang="en" xmltv_id="ESPN.us" site_id="10179">ESPN</channel>
     <channel lang="en" xmltv_id="ESPN2.us" site_id="45507">ESPN 2</channel>
-    <channel lang="en" xmltv_id="ESPNBasesLoaded.us" site_id="80768">ESPN Bases Loaded</channel>
-    <channel lang="en" xmltv_id="ESPNBuzzerBeater.us" site_id="70462">ESPN Buzzer Beater</channel>
     <channel lang="en" xmltv_id="ESPNDeportes.us" site_id="25595">ESPN Deportes</channel>
     <channel lang="en" xmltv_id="ESPNews.us" site_id="59976">ESPNEWS</channel>
     <channel lang="en" xmltv_id="ESPNU.us" site_id="45654">ESPNU</channel>
@@ -206,7 +201,6 @@
     <channel lang="en" xmltv_id="FoxSoccerPlus.us" site_id="66879">Fox Soccer Plus</channel>
     <channel lang="en" xmltv_id="FoxSports1.us" site_id="82547">Fox Sports 1</channel>
     <channel lang="en" xmltv_id="FoxSports2.us" site_id="59305">Fox Sports 2</channel>
-    <channel lang="en" xmltv_id="FoxSportsRacing.us" site_id="30189">Fox Sports Racing</channel>
     <channel lang="en" xmltv_id="FoxWeather.us" site_id="121307">FOX Weather</channel>
     <channel lang="en" xmltv_id="France24English.fr" site_id="70130">France 24 English</channel>
     <channel lang="en" xmltv_id="FreeformEast.us" site_id="10093">Freeform East</channel>
@@ -265,7 +259,7 @@
     <channel lang="en" xmltv_id="HGTVWest.us" site_id="34215">HGTV West</channel>
     <channel lang="en" xmltv_id="HillsongChannel.us" site_id="29328">Hillsong Channel</channel>
     <channel lang="en" xmltv_id="HistoryEast.us" site_id="57708">History East</channel>
-    <channel lang="en" xmltv_id="HistoryenEspanolEast.us" site_id="105678">History en Español East</channel>
+    <channel lang="en" xmltv_id="HistoryenEspanol.us" site_id="105678">History en Español</channel>
     <channel lang="en" xmltv_id="HistoryWest.us" site_id="88545">History West</channel>
     <channel lang="en" xmltv_id="HITN.us" site_id="17142">HITN</channel>
     <channel lang="en" xmltv_id="HLN.us" site_id="10145">HLN</channel>
@@ -421,13 +415,13 @@
     <channel lang="en" xmltv_id="NFLRedZone.us" site_id="89351">NFL Red Zone</channel>
     <channel lang="en" xmltv_id="NHKWorldJapan.jp" site_id="59155">NHK World (US-National)</channel>
     <channel lang="en" xmltv_id="NHLNetwork.us" site_id="58570">NHL Network</channel>
-    <channel lang="en" xmltv_id="NickelodeonUSEast.us" site_id="11006">Nickelodeon East</channel>
-    <channel lang="en" xmltv_id="NickelodeonUSWest.us" site_id="11007">Nickelodeon West</channel>
-    <channel lang="en" xmltv_id="NickJrUSEast.us" site_id="19211">Nick Jr East</channel>
-    <channel lang="en" xmltv_id="NickJrUSWest.us" site_id="77996">Nick Jr West</channel>
+    <channel lang="en" xmltv_id="NickelodeonEast.us" site_id="11006">Nickelodeon East</channel>
+    <channel lang="en" xmltv_id="NickelodeonWest.us" site_id="11007">Nickelodeon West</channel>
+    <channel lang="en" xmltv_id="NickJrEast.us" site_id="19211">Nick Jr East</channel>
+    <channel lang="en" xmltv_id="NickJrWest.us" site_id="77996">Nick Jr West</channel>
     <channel lang="en" xmltv_id="NickMusicUS.us" site_id="90209">NickMusic</channel>
-    <channel lang="en" xmltv_id="NicktoonsUSEast.us" site_id="30420">Nicktoons East</channel>
-    <channel lang="en" xmltv_id="NicktoonsUSWest.us" site_id="91718">Nicktoons West</channel>
+    <channel lang="en" xmltv_id="NicktoonsEast.us" site_id="30420">Nicktoons East</channel>
+    <channel lang="en" xmltv_id="NicktoonsWest.us" site_id="91718">Nicktoons West</channel>
     <channel lang="en" xmltv_id="NRBTV.us" site_id="49097">NRBTV</channel>
     <channel lang="en" xmltv_id="NTDTVEast.us" site_id="11253">NTD TV</channel>
     <channel lang="en" xmltv_id="NTV.bd" site_id="80160">NTV</channel>
@@ -452,7 +446,7 @@
     <channel lang="en" xmltv_id="Pac12Oregon.us" site_id="76371">Pac-12 Oregon</channel>
     <channel lang="en" xmltv_id="Pac12Washington.us" site_id="76373">Pac-12 Washington</channel>
     <channel lang="en" xmltv_id="ParamountNetworkEast.us" site_id="11163">Paramount Network East</channel>
-    <channel lang="en" xmltv_id="PasionesEstadosUnidos.us" site_id="61776">Pasiones US</channel>
+    <channel lang="en" xmltv_id="PasionesUS.us" site_id="61776">Pasiones US</channel>
     <channel lang="en" xmltv_id="PBSEast.us" site_id="33453">PBS East (National Feed)</channel>
     <channel lang="en" xmltv_id="PBSWest.us" site_id="62271">PBS West (National Feed)</channel>
     <channel lang="en" xmltv_id="PBSKidsEasternCentral.us" site_id="101364">PBS Kids East (National Feed)</channel>
@@ -641,7 +635,7 @@
     <channel lang="en" xmltv_id="UniMasWest.us" site_id="31541">Unimas West (National Feed)</channel>
     <channel lang="en" xmltv_id="UniversalKidsEast.us" site_id="47540">Universal Kids</channel>
     <channel lang="en" xmltv_id="UnivisionEast.us" site_id="68049">Univision East (National Feed)</channel>
-    <channel lang="en" xmltv_id="UnivisionTlnovelas.mx" site_id="74550">Univision Tlnovelas</channel>
+    <channel lang="en" xmltv_id="UnivisionTlnovelas.us" site_id="74550">Univision Tlnovelas</channel>
     <channel lang="en" xmltv_id="UnivisionWest.us" site_id="14762">Univision West (National Feed)</channel>
     <channel lang="en" xmltv_id="UpTV.us" site_id="44940">UPtv</channel>
     <channel lang="en" xmltv_id="USANetworkEast.us" site_id="11207">USA Network East</channel>