diff --git a/asap-common/dependencies/py/promql_utilities/promql_utilities/streaming_config/StreamingAggregationConfig.py b/asap-common/dependencies/py/promql_utilities/promql_utilities/streaming_config/StreamingAggregationConfig.py
index 540d411..843b16c 100644
--- a/asap-common/dependencies/py/promql_utilities/promql_utilities/streaming_config/StreamingAggregationConfig.py
+++ b/asap-common/dependencies/py/promql_utilities/promql_utilities/streaming_config/StreamingAggregationConfig.py
@@ -26,14 +26,10 @@ class StreamingAggregationConfig:
     aggregationType: str
     aggregationSubType: str
 
-    # NEW fields for sliding window support (Issue #236)
     windowSize: int  # Window size in seconds (e.g., 900s for 15m)
     slideInterval: int  # Slide/hop interval in seconds (e.g., 30s)
     windowType: str  # "tumbling" or "sliding"
 
-    # DEPRECATED but kept for backward compatibility
-    tumblingWindowSize: int  # For reading old configs
-
     spatialFilter: str
     metric: str  # PromQL mode: metric name
     parameters: dict
@@ -64,18 +60,10 @@ def from_dict(aggregation_config: dict) -> "StreamingAggregationConfig":
         aggregation.aggregationType = aggregation_config["aggregationType"]
         aggregation.aggregationSubType = aggregation_config["aggregationSubType"]
 
-        # NEW: Handle new window fields with backward compatibility
         aggregation.windowType = aggregation_config.get("windowType", "tumbling")
-        aggregation.windowSize = aggregation_config.get(
-            "windowSize", aggregation_config.get("tumblingWindowSize")
-        )
+        aggregation.windowSize = aggregation_config["windowSize"]
         aggregation.slideInterval = aggregation_config.get(
-            "slideInterval", aggregation_config.get("tumblingWindowSize")
-        )
-
-        # Keep deprecated field for backward compatibility
-        aggregation.tumblingWindowSize = aggregation_config.get(
-            "tumblingWindowSize", aggregation.windowSize
+            "slideInterval", aggregation.windowSize
         )
 
         aggregation.spatialFilter = aggregation_config["spatialFilter"]
@@ -150,10 +138,9 @@ def get_identifying_key(self) -> Tuple:
         keys = [
             self.aggregationType,
             self.aggregationSubType,
-            self.windowType,  # NEW: Include window type
-            self.windowSize,  # NEW: Include window size
-            self.slideInterval,  # NEW: Include slide interval
-            self.tumblingWindowSize,  # Keep for backward compatibility
+            self.windowType,
+            self.windowSize,
+            self.slideInterval,
             self.spatialFilter,
             self.metric,
             self.table_name,  # SQL mode: table name
diff --git a/asap-common/dependencies/rs/sketch_db_common/src/aggregation_config.rs b/asap-common/dependencies/rs/sketch_db_common/src/aggregation_config.rs
index 20dcc2b..4746acc 100644
--- a/asap-common/dependencies/rs/sketch_db_common/src/aggregation_config.rs
+++ b/asap-common/dependencies/rs/sketch_db_common/src/aggregation_config.rs
@@ -19,14 +19,10 @@ pub struct AggregationConfig {
     pub rollup_labels: KeyByLabelNames,
     pub original_yaml: String,
 
-    // NEW fields for sliding window support (Issue #236)
     pub window_size: u64,    // Window size in seconds (e.g., 900s for 15m)
     pub slide_interval: u64, // Slide/hop interval in seconds (e.g., 30s)
     pub window_type: String, // "tumbling" or "sliding"
 
-    // DEPRECATED but kept for backward compatibility
-    pub tumbling_window_size: u64,
-
     pub spatial_filter: String,
     pub spatial_filter_normalized: String,
     pub metric: String, // PromQL mode: metric name; SQL mode: derived from table_name.value_column
@@ -51,15 +47,13 @@ impl AggregationConfig {
         aggregated_labels: KeyByLabelNames,
         rollup_labels: KeyByLabelNames,
         original_yaml: String,
-        tumbling_window_size: u64,
+        window_size: u64,
+        slide_interval: u64,
+        window_type: String,
         spatial_filter: String,
         metric: String,
         num_aggregates_to_retain: Option<u64>,
         read_count_threshold: Option<u64>,
-        // NEW parameters for sliding window support
-        window_size: Option<u64>,
-        slide_interval: Option<u64>,
-        window_type: Option<String>,
         // SQL-specific fields
         table_name: Option<String>,
         value_column: Option<String>,
@@ -67,11 +61,6 @@ impl AggregationConfig {
         // Generate normalized spatial filter (placeholder implementation)
         let spatial_filter_normalized = normalize_spatial_filter(&spatial_filter);
 
-        // Handle backward compatibility: if new fields not provided, use tumbling_window_size
-        let window_size = window_size.unwrap_or(tumbling_window_size);
-        let slide_interval = slide_interval.unwrap_or(tumbling_window_size);
-        let window_type = window_type.unwrap_or_else(|| "tumbling".to_string());
-
         Self {
             aggregation_id,
             aggregation_type,
@@ -84,7 +73,6 @@ impl AggregationConfig {
             window_size,
             slide_interval,
             window_type,
-            tumbling_window_size,
             spatial_filter,
             spatial_filter_normalized,
             metric,
@@ -143,19 +131,18 @@ impl AggregationConfig {
         let aggregated_labels = KeyByLabelNames::deserialize_from_json(&data["aggregatedLabels"])?;
         let rollup_labels = KeyByLabelNames::deserialize_from_json(&data["rollupLabels"])?;
 
-        let tumbling_window_size = data["tumblingWindowSize"]
-            .as_u64()
-            .ok_or("Missing tumblingWindowSize")?;
+        let window_size = data["windowSize"].as_u64().ok_or("Missing windowSize")?;
 
-        // NEW: Handle new window fields with backward compatibility
         let window_type = data
             .get("windowType")
             .and_then(|v| v.as_str())
-            .map(|s| s.to_string());
-
-        let window_size = data.get("windowSize").and_then(|v| v.as_u64());
+            .unwrap_or("tumbling")
+            .to_string();
 
-        let slide_interval = data.get("slideInterval").and_then(|v| v.as_u64());
+        let slide_interval = data
+            .get("slideInterval")
+            .and_then(|v| v.as_u64())
+            .unwrap_or(window_size);
 
         let spatial_filter = data["spatialFilter"].as_str().unwrap_or("").to_string();
 
@@ -183,14 +170,13 @@ impl AggregationConfig {
             aggregated_labels,
             rollup_labels,
             original_yaml,
-            tumbling_window_size,
+            window_size,
+            slide_interval,
+            window_type,
             spatial_filter,
             metric,
             num_aggregates_to_retain,
             read_count_threshold,
-            window_size,
-            slide_interval,
-            window_type,
             table_name,
             value_column,
         ))
@@ -265,21 +251,20 @@ impl AggregationConfig {
             })
             .collect();
 
-        let tumbling_window_size = aggregation_data["tumblingWindowSize"]
+        let window_size = aggregation_data["windowSize"]
             .as_u64()
-            .ok_or_else(|| anyhow::anyhow!("Missing tumblingWindowSize"))?;
+            .ok_or_else(|| anyhow::anyhow!("Missing windowSize"))?;
 
-        // NEW: Handle new window fields with backward compatibility
         let window_type = aggregation_data
             .get("windowType")
             .and_then(|v| v.as_str())
-            .map(|s| s.to_string());
-
-        let window_size = aggregation_data.get("windowSize").and_then(|v| v.as_u64());
+            .unwrap_or("tumbling")
+            .to_string();
 
         let slide_interval = aggregation_data
             .get("slideInterval")
-            .and_then(|v| v.as_u64());
+            .and_then(|v| v.as_u64())
+            .unwrap_or(window_size);
 
         let spatial_filter = aggregation_data["spatialFilter"]
             .as_str()
@@ -329,14 +314,13 @@ impl AggregationConfig {
             aggregated_labels,
             rollup_labels,
             String::new(), // original_yaml - empty as in Python
-            tumbling_window_size,
+            window_size,
+            slide_interval,
+            window_type,
             spatial_filter,
             metric,
             num_aggregates_to_retain,
             read_count_threshold,
-            window_size,
-            slide_interval,
-            window_type,
             table_name,
             value_column,
         ))
@@ -351,8 +335,6 @@ impl SerializableToSink for AggregationConfig {
             "aggregationSubType": self.aggregation_sub_type,
             "parameters": self.parameters,
             "originalYaml": self.original_yaml,
-            "tumblingWindowSize": self.tumbling_window_size,
-            // NEW: Include new window fields
             "windowSize": self.window_size,
             "slideInterval": self.slide_interval,
             "windowType": self.window_type,
diff --git a/asap-planner-rs/src/lib.rs b/asap-planner-rs/src/lib.rs
index 74992c0..4f3c346 100644
--- a/asap-planner-rs/src/lib.rs
+++ b/asap-planner-rs/src/lib.rs
@@ -77,7 +77,7 @@ impl PlannerOutput {
             if let Some(YamlValue::Sequence(aggs)) = root.get("aggregations") {
                 return aggs.iter().all(|agg| {
                     if let YamlValue::Mapping(m) = agg {
-                        if let Some(val) = m.get("tumblingWindowSize") {
+                        if let Some(val) = m.get("windowSize") {
                             let size = match val {
                                 YamlValue::Number(n) => n.as_u64().unwrap_or(0),
                                 _ => 0,
diff --git a/asap-planner-rs/src/output/generator.rs b/asap-planner-rs/src/output/generator.rs
index 31aaabf..518319e 100644
--- a/asap-planner-rs/src/output/generator.rs
+++ b/asap-planner-rs/src/output/generator.rs
@@ -227,10 +227,6 @@ fn build_streaming_yaml(
                     None => YamlValue::Null,
                 },
             );
-            map.insert(
-                YamlValue::String("tumblingWindowSize".to_string()),
-                YamlValue::Number(cfg.tumbling_window_size.into()),
-            );
             map.insert(
                 YamlValue::String("value_column".to_string()),
                 match &cfg.value_column {
diff --git a/asap-planner-rs/src/planner/logics.rs b/asap-planner-rs/src/planner/logics.rs
index c18803c..ca49f95 100644
--- a/asap-planner-rs/src/planner/logics.rs
+++ b/asap-planner-rs/src/planner/logics.rs
@@ -61,13 +61,11 @@ fn set_tumbling_window_parameters(
             config.window_size = effective_repeat;
             config.slide_interval = effective_repeat;
             config.window_type = "tumbling".to_string();
-            config.tumbling_window_size = effective_repeat;
         }
         QueryPatternType::OnlySpatial => {
             config.window_size = prometheus_scrape_interval;
             config.slide_interval = prometheus_scrape_interval;
             config.window_type = "tumbling".to_string();
-            config.tumbling_window_size = prometheus_scrape_interval;
         }
     }
 }
@@ -78,7 +76,6 @@ pub struct IntermediateWindowConfig {
     pub window_size: u64,
     pub slide_interval: u64,
     pub window_type: String,
-    pub tumbling_window_size: u64,
 }
 
 pub fn get_precompute_operator_parameters(
diff --git a/asap-planner-rs/src/planner/single_query.rs b/asap-planner-rs/src/planner/single_query.rs
index 9546992..1eee814 100644
--- a/asap-planner-rs/src/planner/single_query.rs
+++ b/asap-planner-rs/src/planner/single_query.rs
@@ -29,7 +29,6 @@ pub struct IntermediateAggConfig {
     pub window_type: String,
     pub window_size: u64,
     pub slide_interval: u64,
-    pub tumbling_window_size: u64,
     pub spatial_filter: String,
     pub metric: String,
     pub table_name: Option<String>,
@@ -66,13 +65,12 @@ impl IntermediateAggConfig {
         }
 
         format!(
-            "{}|{}|{}|{}|{}|{}|{}|{}|{:?}|{:?}|{:?}|{}",
+            "{}|{}|{}|{}|{}|{}|{}|{:?}|{:?}|{:?}|{}",
             self.aggregation_type,
             self.aggregation_sub_type,
             self.window_type,
             self.window_size,
             self.slide_interval,
-            self.tumbling_window_size,
             self.spatial_filter,
             self.metric,
             self.table_name,
@@ -281,7 +279,6 @@ impl SingleQueryProcessor {
                     window_type: window_cfg.window_type.clone(),
                     window_size: window_cfg.window_size,
                     slide_interval: window_cfg.slide_interval,
-                    tumbling_window_size: window_cfg.tumbling_window_size,
                     spatial_filter: spatial_filter.clone(),
                     metric: metric.clone(),
                     table_name: None,
@@ -299,7 +296,6 @@ impl SingleQueryProcessor {
                 window_type: window_cfg.window_type.clone(),
                 window_size: window_cfg.window_size,
                 slide_interval: window_cfg.slide_interval,
-                tumbling_window_size: window_cfg.tumbling_window_size,
                 spatial_filter: spatial_filter.clone(),
                 metric: metric.clone(),
                 table_name: None,
@@ -427,7 +423,6 @@ mod tests {
             window_type: "tumbling".to_string(),
             window_size: 300,
             slide_interval: 300,
-            tumbling_window_size: 300,
             spatial_filter: String::new(),
             metric: "http_requests_total".to_string(),
             table_name: None,
diff --git a/asap-planner-rs/tests/integration.rs b/asap-planner-rs/tests/integration.rs
index 417faca..d51db0d 100644
--- a/asap-planner-rs/tests/integration.rs
+++ b/asap-planner-rs/tests/integration.rs
@@ -305,12 +305,12 @@ fn malformed_yaml_returns_parse_error() {
 
 // --- Overlapping window tests ---
 // Queries where range vector > t_repeat: e.g. [5m] repeated every 60s.
-// Windows are always tumbling (sliding disabled); the planner emits tumblingWindowSize=t_repeat
+// Windows are always tumbling (sliding disabled); the planner emits windowSize=t_repeat
 // and the cleanup param tells the query engine how many windows to retain to cover the range.
 
 #[test]
 fn temporal_overlapping_window_size_equals_t_repeat() {
-    // [5m] range repeated every 60s → tumblingWindowSize = 60, not 300
+    // [5m] range repeated every 60s → windowSize = 60, not 300
     let c = Controller::from_file(
         Path::new("tests/comparison/test_data/configs/temporal_overlapping.yaml"),
         arroyo_opts(),
diff --git a/asap-query-engine/benches/simple_store_bench.rs b/asap-query-engine/benches/simple_store_bench.rs
index 9cab56c..403d96f 100644
--- a/asap-query-engine/benches/simple_store_bench.rs
+++ b/asap-query-engine/benches/simple_store_bench.rs
@@ -134,16 +134,15 @@ fn make_agg_config(
         KeyByLabelNames::empty(),
         KeyByLabelNames::empty(),
         "".to_string(),
-        60,
-        "".to_string(),
+        60,                     // window_size (seconds)
+        60,                     // slide_interval (seconds)
+        "tumbling".to_string(), // window_type
+        "".to_string(),         // spatial_filter
         metric.to_string(),
         num_aggregates_to_retain,
         read_count_threshold,
-        None,
-        None,
-        None,
-        None,
-        None,
+        None, // table_name
+        None, // value_column
     )
 }
 
diff --git a/asap-query-engine/examples/promql/streaming_config.yaml b/asap-query-engine/examples/promql/streaming_config.yaml
index 1c7fac1..03001c9 100644
--- a/asap-query-engine/examples/promql/streaming_config.yaml
+++ b/asap-query-engine/examples/promql/streaming_config.yaml
@@ -9,7 +9,6 @@ aggregations:
   metric: fake_metric
   parameters:
     K: 20
-  tumblingWindowSize: 1
   windowSize: 1
   windowType: tumbling
   spatialFilter: ''
diff --git a/asap-query-engine/examples/sql/streaming_config.yaml b/asap-query-engine/examples/sql/streaming_config.yaml
index d36c54c..dc5265e 100644
--- a/asap-query-engine/examples/sql/streaming_config.yaml
+++ b/asap-query-engine/examples/sql/streaming_config.yaml
@@ -15,7 +15,6 @@ aggregations:
   value_column: cpu_usage
   parameters:
     K: 20
-  tumblingWindowSize: 1
   windowSize: 1
   windowType: tumbling
   spatialFilter: ''
diff --git a/asap-query-engine/src/data_model/precomputed_output.rs b/asap-query-engine/src/data_model/precomputed_output.rs
index 9bd1e6c..ac1c8f5 100644
--- a/asap-query-engine/src/data_model/precomputed_output.rs
+++ b/asap-query-engine/src/data_model/precomputed_output.rs
@@ -480,7 +480,7 @@ impl SerializableToSink for PrecomputedOutput {
 //         assert_eq!(config.aggregation_id, 1);
 //         assert_eq!(config.metric, "cpu_usage");
 //         assert_eq!(config.aggregation_type, "sum");
-//         assert_eq!(config.tumbling_window_size, 10);
+//         assert_eq!(config.window_size, 10);
 //     }
 
 //     #[test]
diff --git a/asap-query-engine/src/engines/simple_engine.rs b/asap-query-engine/src/engines/simple_engine.rs
index 2753d66..3339b47 100644
--- a/asap-query-engine/src/engines/simple_engine.rs
+++ b/asap-query-engine/src/engines/simple_engine.rs
@@ -552,17 +552,17 @@ impl SimpleEngine {
             }
             "SetAggregator" => {
                 // Latest window only
-                let tumbling_window_size = self
+                let window_size = self
                     .streaming_config
                     .get_aggregation_config(agg_info.aggregation_id_for_key)
-                    .map(|config| config.tumbling_window_size * 1000)
+                    .map(|config| config.window_size * 1000)
                     .ok_or_else(|| {
                         format!(
-                            "Failed to get tumbling window size for aggregation {}",
+                            "Failed to get window size for aggregation {}",
                             agg_info.aggregation_id_for_key
                         )
                     })?;
-                (end_timestamp - tumbling_window_size, end_timestamp)
+                (end_timestamp - window_size, end_timestamp)
             }
             other => {
                 return Err(format!("Unsupported key aggregation type: {}", other));
@@ -2507,11 +2507,11 @@ impl SimpleEngine {
         let end_ms = Self::convert_query_time_to_data_time(end);
         let step_ms = (step * 1000.0) as u64;
 
-        // Get tumbling window size
+        // Get window size
         let tumbling_window_ms = self
             .streaming_config
             .get_aggregation_config(base_context.agg_info.aggregation_id_for_value)
-            .map(|config| config.tumbling_window_size * 1000)?;
+            .map(|config| config.window_size * 1000)?;
 
         // Validate parameters
         self.validate_range_query_params(start_ms, end_ms, step_ms, tumbling_window_ms)
diff --git a/asap-query-engine/src/tests/sql_pattern_matching_tests.rs b/asap-query-engine/src/tests/sql_pattern_matching_tests.rs
index d9315fc..b5bc8f4 100644
--- a/asap-query-engine/src/tests/sql_pattern_matching_tests.rs
+++ b/asap-query-engine/src/tests/sql_pattern_matching_tests.rs
@@ -64,7 +64,6 @@ mod tests {
             window_size: window_secs,
             slide_interval: window_secs,
             window_type: "tumbling".to_string(),
-            tumbling_window_size: window_secs,
             spatial_filter: String::new(),
             spatial_filter_normalized: String::new(),
             metric: "cpu_usage".to_string(),
diff --git a/asap-query-engine/src/tests/store_correctness_tests.rs b/asap-query-engine/src/tests/store_correctness_tests.rs
index 5470b18..efc41bd 100644
--- a/asap-query-engine/src/tests/store_correctness_tests.rs
+++ b/asap-query-engine/src/tests/store_correctness_tests.rs
@@ -59,16 +59,15 @@ fn make_agg_config(
         KeyByLabelNames::empty(),
         KeyByLabelNames::empty(),
         "".to_string(),
-        60,
-        "".to_string(),
+        60,                     // window_size (seconds)
+        60,                     // slide_interval (seconds)
+        "tumbling".to_string(), // window_type
+        "".to_string(),         // spatial_filter
         "cpu_usage".to_string(),
         num_aggregates_to_retain,
         read_count_threshold,
-        None,
-        None,
-        None,
-        None,
-        None,
+        None, // table_name
+        None, // value_column
     )
 }
 
diff --git a/asap-query-engine/src/tests/test_utilities/config_builders.rs b/asap-query-engine/src/tests/test_utilities/config_builders.rs
index c88dad8..72135dc 100644
--- a/asap-query-engine/src/tests/test_utilities/config_builders.rs
+++ b/asap-query-engine/src/tests/test_utilities/config_builders.rs
@@ -100,7 +100,6 @@ impl TestConfigBuilder {
             window_size: window_seconds,
             slide_interval: window_seconds,
             window_type: window_type.to_string(),
-            tumbling_window_size: window_seconds,
             spatial_filter: String::new(),
             spatial_filter_normalized: String::new(),
             metric: self.metric.clone(),
@@ -138,7 +137,6 @@ impl TestConfigBuilder {
             window_size: self.scrape_interval,
             slide_interval: self.scrape_interval,
             window_type: "tumbling".to_string(),
-            tumbling_window_size: self.scrape_interval,
             spatial_filter: String::new(),
             spatial_filter_normalized: String::new(),
             metric: self.metric.clone(),
@@ -182,7 +180,6 @@ impl TestConfigBuilder {
             window_size: window_seconds,
             slide_interval: window_seconds,
             window_type: "tumbling".to_string(),
-            tumbling_window_size: window_seconds,
             spatial_filter: String::new(),
             spatial_filter_normalized: String::new(),
             metric: self.metric.clone(),
diff --git a/asap-query-engine/src/tests/test_utilities/engine_factories.rs b/asap-query-engine/src/tests/test_utilities/engine_factories.rs
index 7e40da0..63b769e 100644
--- a/asap-query-engine/src/tests/test_utilities/engine_factories.rs
+++ b/asap-query-engine/src/tests/test_utilities/engine_factories.rs
@@ -82,7 +82,6 @@ pub fn create_engine_single_pop_with_aggregated(
         window_size: 1,
         slide_interval: 1,
         window_type: "tumbling".to_string(),
-        tumbling_window_size: 1,
         spatial_filter: String::new(),
         spatial_filter_normalized: String::new(),
         metric: metric.to_string(),
@@ -180,7 +179,6 @@ pub fn create_engine_dual_input(
         window_size: 1,
         slide_interval: 1,
         window_type: "tumbling".to_string(),
-        tumbling_window_size: 1,
         spatial_filter: String::new(),
         spatial_filter_normalized: String::new(),
         metric: metric.to_string(),
@@ -204,7 +202,6 @@ pub fn create_engine_dual_input(
         window_size: 1,
         slide_interval: 1,
         window_type: "tumbling".to_string(),
-        tumbling_window_size: 1,
         spatial_filter: String::new(),
         spatial_filter_normalized: String::new(),
         metric: metric.to_string(),
@@ -288,7 +285,6 @@ pub fn create_engine_multi_timestamp(
         window_size: 1,
         slide_interval: 1,
         window_type: "tumbling".to_string(),
-        tumbling_window_size: 1,
         spatial_filter: String::new(),
         spatial_filter_normalized: String::new(),
         metric: metric.to_string(),
@@ -369,7 +365,6 @@ pub fn create_engine_multi_timestamp_with_window(
         window_size,
         slide_interval: 1,
         window_type: window_type.to_string(),
-        tumbling_window_size: window_size,
         spatial_filter: String::new(),
         spatial_filter_normalized: String::new(),
         metric: metric.to_string(),
diff --git a/asap-query-engine/src/utils/file_io.rs b/asap-query-engine/src/utils/file_io.rs
index 6ec8fb9..6fb950b 100644
--- a/asap-query-engine/src/utils/file_io.rs
+++ b/asap-query-engine/src/utils/file_io.rs
@@ -62,7 +62,7 @@ aggregations:
   parameters:
     K: 200
   spatialFilter: ''
-  tumblingWindowSize: 10
+  windowSize: 10
 metrics:
   fake_metric_total:
   - instance
diff --git a/asap-summary-ingest/examples/configs/streaming_config.yaml b/asap-summary-ingest/examples/configs/streaming_config.yaml
index e42bef5..c5c1f10 100644
--- a/asap-summary-ingest/examples/configs/streaming_config.yaml
+++ b/asap-summary-ingest/examples/configs/streaming_config.yaml
@@ -16,7 +16,7 @@ aggregations:
   metric: fake_metric_total
   parameters: {}
   spatialFilter: ''
-  tumblingWindowSize: 10
+  windowSize: 10
 # - aggregationId: 2
 #   aggregationSubType: ''
 #   aggregationType: MultipleIncrease
@@ -32,7 +32,7 @@ aggregations:
 #   metric: fake_metric_total
 #   parameters: {}
 #   spatialFilter: ''
-#   tumblingWindowSize: 10
+#   windowSize: 10
 # - aggregationId: 3
 #   aggregationSubType: sum
 #   aggregationType: MultipleSum
@@ -48,7 +48,7 @@ aggregations:
 #   metric: fake_metric_total
 #   parameters: {}
 #   spatialFilter: ''
-#   tumblingWindowSize: 10
+#   windowSize: 10
 - aggregationId: 4
   aggregationSubType: sum
   aggregationType: MultipleSum
@@ -64,7 +64,7 @@ aggregations:
   metric: fake_metric_total
   parameters: {}
   spatialFilter: ''
-  tumblingWindowSize: 10
+  windowSize: 10
 metrics:
   fake_metric_total:
   - instance
diff --git a/asap-summary-ingest/examples/configs/test_promql_streaming_config.yaml b/asap-summary-ingest/examples/configs/test_promql_streaming_config.yaml
index 1edd171..36483ca 100644
--- a/asap-summary-ingest/examples/configs/test_promql_streaming_config.yaml
+++ b/asap-summary-ingest/examples/configs/test_promql_streaming_config.yaml
@@ -23,6 +23,5 @@ aggregations:
     K: 20
   slideInterval: 60
   spatialFilter: ''
-  tumblingWindowSize: 60
   windowSize: 60
   windowType: tumbling
diff --git a/asap-summary-ingest/examples/configs/test_sql_streaming_config.yaml b/asap-summary-ingest/examples/configs/test_sql_streaming_config.yaml
index 8dc260f..670f2f4 100644
--- a/asap-summary-ingest/examples/configs/test_sql_streaming_config.yaml
+++ b/asap-summary-ingest/examples/configs/test_sql_streaming_config.yaml
@@ -23,6 +23,5 @@ aggregations:
       K: 20
     slideInterval: 1
     spatialFilter: ''
-    tumblingWindowSize: 1
     windowSize: 1
     windowType: tumbling
diff --git a/asap-summary-ingest/run_arroyosketch.py b/asap-summary-ingest/run_arroyosketch.py
index af0a4fc..d5f7414 100644
--- a/asap-summary-ingest/run_arroyosketch.py
+++ b/asap-summary-ingest/run_arroyosketch.py
@@ -607,12 +607,9 @@ def get_sql_query(
     filter_metric_name: str = None,
 ) -> Tuple[str, str, dict]:
 
-    # NEW: Support both tumbling and sliding windows (Issue #236)
     window_type = streaming_aggregation_config.windowType
-    window_interval = "{} seconds".format(
-        streaming_aggregation_config.tumblingWindowSize
-    )
     window_size = "{} seconds".format(streaming_aggregation_config.windowSize)
+    window_interval = window_size
     slide_interval = "{} seconds".format(streaming_aggregation_config.slideInterval)
 
     logger.info(
diff --git a/asap-summary-ingest/tests/test_integration.py b/asap-summary-ingest/tests/test_integration.py
index f3bf82f..86e47ad 100644
--- a/asap-summary-ingest/tests/test_integration.py
+++ b/asap-summary-ingest/tests/test_integration.py
@@ -193,7 +193,7 @@ def sql_agg_config(self):
                 },
                 "parameters": {},
                 "spatialFilter": "",
-                "tumblingWindowSize": 10,
+                "windowSize": 10,
             }
         )
 
@@ -277,7 +277,7 @@ def promql_agg_config(self):
                 },
                 "parameters": {},
                 "spatialFilter": "",
-                "tumblingWindowSize": 10,
+                "windowSize": 10,
             }
         )
 
@@ -367,7 +367,7 @@ def test_parse_sql_config_file(self):
       rollup: []
     parameters: {}
     spatialFilter: ''
-    tumblingWindowSize: 10
+    windowSize: 10
 """
         config = yaml.safe_load(config_content)
 
@@ -403,7 +403,7 @@ def test_parse_promql_config_file(self):
     metric: fake_metric_total
     parameters: {}
     spatialFilter: ''
-    tumblingWindowSize: 10
+    windowSize: 10
 
 metrics:
   fake_metric_total:
diff --git a/asap-summary-ingest/tests/test_sql_schema.py b/asap-summary-ingest/tests/test_sql_schema.py
index 5924ddf..0af03be 100644
--- a/asap-summary-ingest/tests/test_sql_schema.py
+++ b/asap-summary-ingest/tests/test_sql_schema.py
@@ -153,7 +153,7 @@ def test_parse_sql_aggregation_config(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -176,7 +176,7 @@ def test_default_value_column(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -197,7 +197,7 @@ def test_get_source_identifier_sql(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -230,7 +230,7 @@ def test_validate_sql_mode_success(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -255,7 +255,7 @@ def test_validate_sql_mode_missing_table(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -290,7 +290,7 @@ def test_validate_sql_mode_invalid_value_column(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -325,7 +325,7 @@ def test_validate_sql_mode_mismatched_labels(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -351,7 +351,7 @@ def test_parse_promql_aggregation_config(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -373,7 +373,7 @@ def test_get_source_identifier_promql(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -396,7 +396,7 @@ def test_validate_promql_mode_success(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
@@ -420,7 +420,7 @@ def test_validate_promql_mode_default(self):
             },
             "parameters": {},
             "spatialFilter": "",
-            "tumblingWindowSize": 10,
+            "windowSize": 10,
         }
 
         agg_config = StreamingAggregationConfig.from_dict(config_dict)
diff --git a/asap-tools/execution-utilities/asap_query_latency/streaming_config.yaml b/asap-tools/execution-utilities/asap_query_latency/streaming_config.yaml
index 633d8b9..3307990 100644
--- a/asap-tools/execution-utilities/asap_query_latency/streaming_config.yaml
+++ b/asap-tools/execution-utilities/asap_query_latency/streaming_config.yaml
@@ -20,7 +20,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 1
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -35,7 +35,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 1
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -50,7 +50,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 1
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -66,7 +66,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 10
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -82,7 +82,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 10
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -99,7 +99,6 @@ aggregations:
     value_column: ResolutionWidth
     parameters:
       K: 200
-    tumblingWindowSize: 10
     windowSize: 10
     windowType: tumbling
     spatialFilter: ''
@@ -115,7 +114,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 10
   #   windowType: tumbling
   #   spatialFilter: ''
@@ -130,7 +129,7 @@ aggregations:
   #   table_name: hits
   #   value_column: ResolutionWidth
   #   parameters: {}
-  #   tumblingWindowSize: 1
+  #   windowSize: 1
   #   windowSize: 10
   #   windowType: tumbling
   #   spatialFilter: ''