diff --git a/src/screener/t_atr_ema.py b/src/screener/t_atr_ema.py
index 4253440..65fd273 100644
--- a/src/screener/t_atr_ema.py
+++ b/src/screener/t_atr_ema.py
@@ -87,7 +87,7 @@ def run_atr_ema_scanner(min_price: float, max_price: float, min_volume: int, por
             daily_data AS (
                 SELECT
                     ticker,
-                    toDate(trade_date) as trade_date,
+                    toDate(trade_date) as date,
                     argMax(close, window_start) as daily_close,
                     sum(volume) as daily_volume
                 FROM filtered_data
@@ -98,9 +98,9 @@ def run_atr_ema_scanner(min_price: float, max_price: float, min_volume: int, por
             latest_data AS (
                 SELECT 
                     ticker,
-                    argMax(daily_close, trade_date) as last_close,
+                    argMax(daily_close, date) as last_close,
                     sum(daily_volume) as total_volume,
-                    max(toUnixTimestamp(trade_date)) as last_update
+                    max(toUnixTimestamp(date)) as last_update
                 FROM daily_data
                 GROUP BY ticker
             )
diff --git a/src/screener/t_atr_ema_v2.py b/src/screener/t_atr_ema_v2.py
index 97f4a22..a4d65be 100644
--- a/src/screener/t_atr_ema_v2.py
+++ b/src/screener/t_atr_ema_v2.py
@@ -96,7 +96,7 @@ def run_atr_ema_scanner_v2(min_price: float, max_price: float, min_volume: int,
             daily_data AS (
                 SELECT
                     ticker,
-                    toDate(trade_date) as trade_date,
+                    toDate(trade_date) as date,
                     argMax(close, window_start) as daily_close,
                     sum(volume) as daily_volume
                 FROM filtered_data
@@ -107,9 +107,9 @@ def run_atr_ema_scanner_v2(min_price: float, max_price: float, min_volume: int,
             latest_data AS (
                 SELECT 
                     ticker,
-                    argMax(daily_close, trade_date) as last_close,
+                    argMax(daily_close, date) as last_close,
                     sum(daily_volume) as total_volume,
-                    max(toUnixTimestamp(trade_date)) as last_update
+                    max(toUnixTimestamp(date)) as last_update
                 FROM daily_data
                 GROUP BY ticker
             )