diff --git a/M3U8/fetch.py b/M3U8/fetch.py
index dd74d69..266be75 100644
--- a/M3U8/fetch.py
+++ b/M3U8/fetch.py
@@ -56,7 +56,7 @@ async def main() -> None:
         asyncio.create_task(roxie.scrape(network.client)),
         asyncio.create_task(shark.scrape(network.client)),
         asyncio.create_task(sport9.scrape(network.client)),
-        asyncio.create_task(streambtw.scrape(network.client)),
+        # asyncio.create_task(streambtw.scrape(network.client)),
         asyncio.create_task(streamcenter.scrape(network.client)),
         asyncio.create_task(streamfree.scrape(network.client)),
         asyncio.create_task(streamhub.scrape(network.client)),
diff --git a/M3U8/scrapers/fawa.py b/M3U8/scrapers/fawa.py
index 83db6b8..9623388 100644
--- a/M3U8/scrapers/fawa.py
+++ b/M3U8/scrapers/fawa.py
@@ -13,7 +13,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "FAWA"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
 BASE_URL = "http://www.fawanews.sc/"
 
diff --git a/M3U8/scrapers/lotus.py b/M3U8/scrapers/lotus.py
index 831d674..5699d45 100644
--- a/M3U8/scrapers/lotus.py
+++ b/M3U8/scrapers/lotus.py
@@ -11,9 +11,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "LOTUS"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=5_400)
+CACHE_FILE = Cache(f"{TAG}.json", exp=5_400)
 
-API_CACHE = Cache(f"{TAG.lower()}-api.json", exp=28_800)
+API_CACHE = Cache(f"{TAG}-api.json", exp=28_800)
 
 BASE_URL = "https://lotusgamehd.xyz/api-event.php"
 
diff --git a/M3U8/scrapers/pixel.py b/M3U8/scrapers/pixel.py
index 3933435..5347cd4 100644
--- a/M3U8/scrapers/pixel.py
+++ b/M3U8/scrapers/pixel.py
@@ -10,7 +10,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "PIXEL"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=19_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=19_800)
 
 BASE_URL = "https://pixelsport.tv/backend/livetv/events"
 
diff --git a/M3U8/scrapers/ppv.py b/M3U8/scrapers/ppv.py
index 8d020c6..c399cf9 100644
--- a/M3U8/scrapers/ppv.py
+++ b/M3U8/scrapers/ppv.py
@@ -11,9 +11,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "PPV"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-API_FILE = Cache(f"{TAG.lower()}-api.json", exp=19_800)
+API_FILE = Cache(f"{TAG}-api.json", exp=19_800)
 
 API_MIRRORS = [
     "https://old.ppv.to/api/streams",
diff --git a/M3U8/scrapers/roxie.py b/M3U8/scrapers/roxie.py
index b7d17ac..721d327 100644
--- a/M3U8/scrapers/roxie.py
+++ b/M3U8/scrapers/roxie.py
@@ -14,9 +14,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "ROXIE"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-HTML_CACHE = Cache(f"{TAG.lower()}-html.json", exp=19_800)
+HTML_CACHE = Cache(f"{TAG}-html.json", exp=19_800)
 
 BASE_URL = "https://roxiestreams.live"
 
diff --git a/M3U8/scrapers/shark.py b/M3U8/scrapers/shark.py
index db8807a..fbbc350 100644
--- a/M3U8/scrapers/shark.py
+++ b/M3U8/scrapers/shark.py
@@ -12,9 +12,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "SHARK"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-HTML_CACHE = Cache(f"{TAG.lower()}-html.json", exp=19_800)
+HTML_CACHE = Cache(f"{TAG}-html.json", exp=19_800)
 
 BASE_URL = "https://sharkstreams.net"
 
diff --git a/M3U8/scrapers/sport9.py b/M3U8/scrapers/sport9.py
index 0b2ba19..285f626 100644
--- a/M3U8/scrapers/sport9.py
+++ b/M3U8/scrapers/sport9.py
@@ -12,9 +12,9 @@ log = get_logger(__name__)
 
 urls: dict[str, dict[str, str | float]] = {}
 
-TAG = "SPRT9"
+TAG = "SPORT9"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=3_600)
+CACHE_FILE = Cache(f"{TAG}.json", exp=3_600)
 
 BASE_URL = "https://sport9.ru"
 
diff --git a/M3U8/scrapers/streambtw.py b/M3U8/scrapers/streambtw.py
index 75e653b..0e144b0 100644
--- a/M3U8/scrapers/streambtw.py
+++ b/M3U8/scrapers/streambtw.py
@@ -14,7 +14,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "STRMBTW"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=3_600)
+CACHE_FILE = Cache(f"{TAG}.json", exp=3_600)
 
 BASE_URL = "https://streambtw.com"
 
diff --git a/M3U8/scrapers/streamcenter.py b/M3U8/scrapers/streamcenter.py
index cde06c8..5b570a3 100644
--- a/M3U8/scrapers/streamcenter.py
+++ b/M3U8/scrapers/streamcenter.py
@@ -11,9 +11,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "STRMCNTR"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-API_FILE = Cache(f"{TAG.lower()}-api.json", exp=28_800)
+API_FILE = Cache(f"{TAG}-api.json", exp=28_800)
 
 BASE_URL = "https://backendstreamcenter.youshop.pro:488/api/Parties"
 
@@ -68,7 +68,7 @@ async def get_events(
     events = []
 
     start_dt = now.delta(minutes=-30)
-    end_dt = now.delta(minutes=30)
+    end_dt = now.delta(minutes=10)
 
     for stream_group in api_data:
         category_id: int = stream_group.get("categoryId")
diff --git a/M3U8/scrapers/streamfree.py b/M3U8/scrapers/streamfree.py
index 2a1ba2f..4e65602 100644
--- a/M3U8/scrapers/streamfree.py
+++ b/M3U8/scrapers/streamfree.py
@@ -10,7 +10,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "STRMFREE"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=19_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=19_800)
 
 BASE_URL = "https://streamfree.to/"
 
diff --git a/M3U8/scrapers/streamhub.py b/M3U8/scrapers/streamhub.py
index 6c05328..5103075 100644
--- a/M3U8/scrapers/streamhub.py
+++ b/M3U8/scrapers/streamhub.py
@@ -14,9 +14,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "STRMHUB"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-HTML_CACHE = Cache(f"{TAG.lower()}-html.json", exp=28_800)
+HTML_CACHE = Cache(f"{TAG}-html.json", exp=28_800)
 
 BASE_URL = "https://streamhub.pro/"
 
diff --git a/M3U8/scrapers/streamsgate.py b/M3U8/scrapers/streamsgate.py
index 953f585..1428154 100644
--- a/M3U8/scrapers/streamsgate.py
+++ b/M3U8/scrapers/streamsgate.py
@@ -13,11 +13,11 @@ log = get_logger(__name__)
 
 urls: dict[str, dict[str, str | float]] = {}
 
-TAG = "STRMSG8"
+TAG = "STRMSGATE"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-API_FILE = Cache(f"{TAG.lower()}-api.json", exp=28_800)
+API_FILE = Cache(f"{TAG}-api.json", exp=28_800)
 
 BASE_URL = "https://streamingon.org"
 
diff --git a/M3U8/scrapers/strmd.py b/M3U8/scrapers/strmd.py
index 6fc6645..b06bf60 100644
--- a/M3U8/scrapers/strmd.py
+++ b/M3U8/scrapers/strmd.py
@@ -14,9 +14,9 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "STRMD"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-API_FILE = Cache(f"{TAG.lower()}-api.json", exp=28_800)
+API_FILE = Cache(f"{TAG}-api.json", exp=28_800)
 
 MIRRORS = [
     "https://streami.su",
diff --git a/M3U8/scrapers/timstreams.py b/M3U8/scrapers/timstreams.py
index fe7616c..8881840 100644
--- a/M3U8/scrapers/timstreams.py
+++ b/M3U8/scrapers/timstreams.py
@@ -12,7 +12,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "TIM"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=3_600)
 
 API_URL = "https://api.timstreams.site/main"
 
diff --git a/M3U8/scrapers/tvpass.py b/M3U8/scrapers/tvpass.py
index 2fb9b32..744ed1b 100644
--- a/M3U8/scrapers/tvpass.py
+++ b/M3U8/scrapers/tvpass.py
@@ -10,7 +10,7 @@ urls: dict[str, dict[str, str | float]] = {}
 
 TAG = "TVP"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=86_400)
+CACHE_FILE = Cache(f"{TAG}.json", exp=86_400)
 
 BASE_URL = "https://tvpass.org/playlist/m3u"
 
diff --git a/M3U8/scrapers/watchfooty.py b/M3U8/scrapers/watchfooty.py
index 29c02c1..804edb1 100644
--- a/M3U8/scrapers/watchfooty.py
+++ b/M3U8/scrapers/watchfooty.py
@@ -14,11 +14,11 @@ log = get_logger(__name__)
 
 urls: dict[str, dict[str, str | float]] = {}
 
-TAG = "WFTY"
+TAG = "WATCHFTY"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-API_FILE = Cache(f"{TAG.lower()}-api.json", exp=28_800)
+API_FILE = Cache(f"{TAG}-api.json", exp=28_800)
 
 API_MIRRORS = ["https://api.watchfooty.top", "https://api.watchfooty.st"]
 
diff --git a/M3U8/scrapers/webcast.py b/M3U8/scrapers/webcast.py
index 07d8ec2..35e23bb 100644
--- a/M3U8/scrapers/webcast.py
+++ b/M3U8/scrapers/webcast.py
@@ -11,11 +11,11 @@ log = get_logger(__name__)
 
 urls: dict[str, dict[str, str | float]] = {}
 
-TAG = "WEBCST"
+TAG = "WEBCAST"
 
-CACHE_FILE = Cache(f"{TAG.lower()}.json", exp=10_800)
+CACHE_FILE = Cache(f"{TAG}.json", exp=10_800)
 
-HTML_CACHE = Cache(f"{TAG.lower()}-html.json", exp=86_400)
+HTML_CACHE = Cache(f"{TAG}-html.json", exp=86_400)
 
 BASE_URLS = {"NFL": "https://nflwebcast.com", "NHL": "https://slapstreams.com"}