diff --git a/streams/us.m3u b/streams/us.m3u
index f8a93d0aa..ae65a27d1 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -307,7 +307,7 @@ https://streannliveevtv.cachefly.net/Protected/sp=1;dirmatch=true/3be25dc13406bf
 https://cdn3.wowza.com/1/ZVBYYXFLLzE0c3NC/Qk1FMURC/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTN.us@AsiaPacific",EWTN Asia-Pacific (720p) [Not 24/7]
 https://cdn3.wowza.com/1/QmVNUVhTNTZSS3Uz/YWQ0aHpi/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTNEspanaLatinAmerica.us",EWTN el Canal Católico (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EWTN.us@SpanishLatinAmerica",EWTN el Canal Católico (720p) [Not 24/7]
 https://cdn3.wowza.com/1/SmVrQmZCUXZhVDgz/b3J3MFJv/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTN.us@UnitedStates",EWTN Estados Unidos (Spanish) (720p)
 https://cdn3.wowza.com/1/TUI5dU5ucnUxdGFD/ZFlVeGRl/hls/live/playlist.m3u8
diff --git a/streams/us_moveonjoy.m3u b/streams/us_moveonjoy.m3u
index 09b2fe2b4..d1016189b 100644
--- a/streams/us_moveonjoy.m3u
+++ b/streams/us_moveonjoy.m3u
@@ -67,7 +67,7 @@ http://fl3.moveonjoy.com/Curiosity_Stream/index.m3u8
 http://fl2.moveonjoy.com/DISNEY_JR/index.m3u8
 #EXTINF:-1 tvg-id="DisneyXD.us@West",Disney XD West (720p)
 http://fl2.moveonjoy.com/DISNEY_XD/index.m3u8
-#EXTINF:-1 tvg-id="EEast.us",E! East
+#EXTINF:-1 tvg-id="E.us@East",E! East
 http://fl2.moveonjoy.com/E_ENTERTAINMENT_TELEVISION/index.m3u8
 #EXTINF:-1 tvg-id="ESPNU.us",ESPN U (720p)
 http://fl2.moveonjoy.com/ESPN_U/index.m3u8
@@ -77,7 +77,7 @@ http://fl2.moveonjoy.com/ESPN_NEWS/index.m3u8
 http://fl2.moveonjoy.com/FOX_Business_Network/index.m3u8
 #EXTINF:-1 tvg-id="FoxSoul.us",Fox Soul
 http://fl1.moveonjoy.com/FOX_SOUL/index.m3u8
-#EXTINF:-1 tvg-id="FoxSports1.us",Fox Sports 1
+#EXTINF:-1 tvg-id="",Fox Sports 1
 http://fl2.moveonjoy.com/FOX_Sports_1/index.m3u8
 #EXTINF:-1 tvg-id="Freeform.us@East",Free form East
 http://fl2.moveonjoy.com/FREE_FORM/index.m3u8
@@ -155,7 +155,7 @@ http://fl2.moveonjoy.com/National_Geographic/index.m3u8
 http://fl2.moveonjoy.com/Nat_Geo_Wild/index.m3u8
 #EXTINF:-1 tvg-id="NBATV.us",NBA TV
 http://fl2.moveonjoy.com/NBA_TV/index.m3u8
-#EXTINF:-1 tvg-id="NewsNation.us@East",News Nation (720p)
+#EXTINF:-1 tvg-id="NewsNationEast.us",News Nation (720p)
 http://fl2.moveonjoy.com/NEWS_NATION/index.m3u8
 #EXTINF:-1 tvg-id="NFLNetwork.us",NFL Network
 http://fl2.moveonjoy.com/NFL_NETWORK/index.m3u8
@@ -233,7 +233,7 @@ http://fl5.moveonjoy.com/TSN_3/index.m3u8
 http://fl5.moveonjoy.com/TSN_4/index.m3u8
 #EXTINF:-1 tvg-id="TSN5.ca",TSN5
 http://fl5.moveonjoy.com/TSN_5/index.m3u8
-#EXTINF:-1 tvg-id="TVLandEast.us",TV Land East
+#EXTINF:-1 tvg-id="TVLand.us@East",TV Land East
 http://fl2.moveonjoy.com/TV_Land/index.m3u8
 #EXTINF:-1 tvg-id="TVOne.us",TV One
 http://fl2.moveonjoy.com/TV_ONE/index.m3u8
@@ -241,7 +241,7 @@ http://fl2.moveonjoy.com/TV_ONE/index.m3u8
 http://fl3.moveonjoy.com/Up_Tv/index.m3u8
 #EXTINF:-1 tvg-id="USANetwork.us@East",USA Network East (720p)
 http://fl2.moveonjoy.com/USA_Network/index.m3u8
-#EXTINF:-1 tvg-id="VH1East.us",VH1 East
+#EXTINF:-1 tvg-id="VH1.us@East",VH1 East
 http://fl2.moveonjoy.com/VH1/index.m3u8
 #EXTINF:-1 tvg-id="VICETV.us",VICE TV (720p)
 http://fl2.moveonjoy.com/VICELAND/index.m3u8