diff --git a/metricflow/plan_conversion/convert_to_sql_plan.py b/metricflow/plan_conversion/convert_to_sql_plan.py
index 7b9eacfbb6..a02cf913e9 100644
--- a/metricflow/plan_conversion/convert_to_sql_plan.py
+++ b/metricflow/plan_conversion/convert_to_sql_plan.py
@@ -4,7 +4,7 @@
 
 from metricflow_semantics.instances import InstanceSet
 
-from metricflow.sql.sql_plan import SqlQueryPlan
+from metricflow.sql.sql_plan import SqlPlan
 
 
 @dataclass(frozen=True)
@@ -12,4 +12,4 @@ class ConvertToSqlPlanResult:
     """Result object for returning the results of converting to a `SqlQueryPlan`."""
 
     instance_set: InstanceSet
-    sql_plan: SqlQueryPlan
+    sql_plan: SqlPlan
diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index 60f645461a..90918cb8f4 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -139,7 +139,7 @@
     SqlCteNode,
     SqlJoinDescription,
     SqlOrderByDescription,
-    SqlQueryPlan,
+    SqlPlan,
     SqlQueryPlanNode,
     SqlSelectColumn,
     SqlSelectStatementNode,
@@ -327,7 +327,7 @@ def convert_using_specifics(
 
         return ConvertToSqlPlanResult(
             instance_set=data_set.instance_set,
-            sql_plan=SqlQueryPlan(render_node=sql_node, plan_id=sql_query_plan_id),
+            sql_plan=SqlPlan(render_node=sql_node, plan_id=sql_query_plan_id),
         )
 
     def _get_nodes_to_convert_to_cte(
diff --git a/metricflow/sql/render/sql_plan_renderer.py b/metricflow/sql/render/sql_plan_renderer.py
index fd46f4af39..9e0fb11f6e 100644
--- a/metricflow/sql/render/sql_plan_renderer.py
+++ b/metricflow/sql/render/sql_plan_renderer.py
@@ -23,7 +23,7 @@
     SqlCteNode,
     SqlJoinDescription,
     SqlOrderByDescription,
-    SqlQueryPlan,
+    SqlPlan,
     SqlQueryPlanNode,
     SqlQueryPlanNodeVisitor,
     SqlSelectColumn,
@@ -49,7 +49,7 @@ class SqlQueryPlanRenderer(SqlQueryPlanNodeVisitor[SqlPlanRenderResult], ABC):
     def _render_node(self, node: SqlQueryPlanNode) -> SqlPlanRenderResult:
         return node.accept(self)
 
-    def render_sql_query_plan(self, sql_query_plan: SqlQueryPlan) -> SqlPlanRenderResult:  # noqa: D102
+    def render_sql_query_plan(self, sql_query_plan: SqlPlan) -> SqlPlanRenderResult:  # noqa: D102
         return self._render_node(sql_query_plan.render_node)
 
     @property
diff --git a/metricflow/sql/sql_plan.py b/metricflow/sql/sql_plan.py
index e45b8bd792..792498cc2e 100644
--- a/metricflow/sql/sql_plan.py
+++ b/metricflow/sql/sql_plan.py
@@ -392,14 +392,14 @@ def nearest_select_columns(
         return self.parent_node.nearest_select_columns(cte_source_mapping)
 
 
-class SqlQueryPlan(MetricFlowDag[SqlQueryPlanNode]):
-    """Model for an SQL Query as a DAG."""
+class SqlPlan(MetricFlowDag[SqlQueryPlanNode]):
+    """Model for an SQL statement as a DAG."""
 
     def __init__(self, render_node: SqlQueryPlanNode, plan_id: Optional[DagId] = None) -> None:
-        """Constructor.
+        """initializer.
 
         Args:
-            render_node: The node from which to start rendering the SQL query.
+            render_node: The node from which to start rendering the SQL statement.
             plan_id: If specified, use this sql_query_plan_id instead of a generated one.
         """
         self._render_node = render_node
diff --git a/tests_metricflow/mf_logging/test_dag_to_text.py b/tests_metricflow/mf_logging/test_dag_to_text.py
index 06b705357e..c7a8a3c88f 100644
--- a/tests_metricflow/mf_logging/test_dag_to_text.py
+++ b/tests_metricflow/mf_logging/test_dag_to_text.py
@@ -16,7 +16,7 @@
     SqlStringExpression,
 )
 from metricflow.sql.sql_plan import (
-    SqlQueryPlan,
+    SqlPlan,
     SqlSelectColumn,
     SqlSelectStatementNode,
     SqlTableNode,
@@ -32,7 +32,7 @@ def test_multithread_dag_to_text() -> None:
 
     # Using a nested structure w/ small max_line_length to force recursion / cover recursive width tracking.
     dag_to_text_formatter = MetricFlowDagTextFormatter(max_width=1)
-    dag = SqlQueryPlan(
+    dag = SqlPlan(
         plan_id=DagId("plan"),
         render_node=SqlSelectStatementNode.create(
             description="test",
@@ -68,7 +68,7 @@ def _run_mf_pformat() -> None:
 
     expected_thread_output = textwrap.dedent(
         """\
-        <SqlQueryPlan>
+        <SqlPlan>
             <SqlSelectStatementNode>
                 <!-- description =  -->
                 <!--   'test' -->
@@ -100,7 +100,7 @@ def _run_mf_pformat() -> None:
                     <!--   'schema.table' -->
                 </SqlTableNode>
             </SqlSelectStatementNode>
-        </SqlQueryPlan>
+        </SqlPlan>
         """
     ).rstrip()
     assert thread_outputs == [expected_thread_output for _ in range(num_threads)]
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_if_in_where__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_if_in_where__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_if_in_where__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_if_in_where__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_if_in_where__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_if_in_where__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_if_in_where__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_if_in_where__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_with_str_expr__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_with_str_expr__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_with_str_expr__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_with_str_expr__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_with_str_expr__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_with_str_expr__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_dont_prune_with_str_expr__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_dont_prune_with_str_expr__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_no_pruning__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_no_pruning__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_no_pruning__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_no_pruning__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_no_pruning__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_no_pruning__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_no_pruning__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_no_pruning__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_distinct_select__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_distinct_select__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_distinct_select__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_distinct_select__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_distinct_select__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_distinct_select__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_distinct_select__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_distinct_select__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_from_source__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_from_source__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_from_source__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_from_source__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_from_source__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_from_source__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_from_source__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_from_source__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents_in_join_query__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents_in_join_query__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents_in_join_query__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents_in_join_query__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents_in_join_query__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents_in_join_query__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_grandparents_in_join_query__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_grandparents_in_join_query__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_joined_source__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_joined_source__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_joined_source__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_joined_source__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_joined_source__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_joined_source__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_joined_source__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_joined_source__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_str_expr__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_str_expr__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_str_expr__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_str_expr__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_str_expr__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_str_expr__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_str_expr__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_str_expr__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_with_str_expr__after_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_with_str_expr__after_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_with_str_expr__after_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_with_str_expr__after_pruning.sql
diff --git a/tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_with_str_expr__before_pruning.sql b/tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_with_str_expr__before_pruning.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_column_pruner.py/SqlQueryPlan/test_prune_with_str_expr__before_pruning.sql
rename to tests_metricflow/snapshots/test_column_pruner.py/SqlPlan/test_prune_with_str_expr__before_pruning.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_count_with_no_group_by__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_count_with_no_group_by__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_count_with_no_group_by__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_count_with_no_group_by__plan0.xml
index d91dd0fbb9..76441e3b99 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_count_with_no_group_by__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_count_with_no_group_by__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_15') -->
@@ -1613,4 +1613,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
index 50b2f52859..6912f4b1de 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_24') -->
@@ -2002,4 +2002,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate__plan0.xml
index da8946606c..ce9268fdfa 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_15') -->
@@ -1672,4 +1672,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_constant_properties__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_constant_properties__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_constant_properties__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_constant_properties__plan0.xml
index 8431d96a82..b1300974bd 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_constant_properties__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_constant_properties__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_15') -->
@@ -1717,4 +1717,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_no_group_by__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_no_group_by__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_no_group_by__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_no_group_by__plan0.xml
index bcc3bec611..3c270d9a90 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_no_group_by__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_no_group_by__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_15') -->
@@ -1616,4 +1616,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_window__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_window__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_window__plan0.xml
rename to tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_window__plan0.xml
index 42b54ce4e4..272d8cfa23 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_window__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_rate_with_window__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_15') -->
@@ -1704,4 +1704,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_query_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_query_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
rename to tests_metricflow/snapshots/test_convert_semantic_model.py/SqlPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index b1d0193e5e..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATETIME_TRUNC(subq_4.ds, month) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            metric_time__month
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, month) AS monthly_ds__month
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, quarter) AS monthly_ds__quarter
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, year) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, month) AS booking__monthly_ds__month
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, quarter) AS booking__monthly_ds__quarter
-                , DATETIME_TRUNC(bookings_monthly_source_src_16000.ds, year) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > DATE_SUB(CAST(subq_3.metric_time__month AS DATETIME), INTERVAL 3 month)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index 133c390be6..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATETIME_TRUNC(ds, month) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    metric_time__month
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATETIME_TRUNC(ds, month) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATETIME_TRUNC(ds, month) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > DATE_SUB(CAST(subq_12.metric_time__month AS DATETIME), INTERVAL 3 month)
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 5bc9116fc1..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > DATEADD(month, -3, subq_3.metric_time__month)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index 4611f8316c..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > DATEADD(month, -3, subq_12.metric_time__month)
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 238774265f..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > subq_3.metric_time__month - INTERVAL 3 month
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index df00087c33..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > subq_12.metric_time__month - INTERVAL 3 month
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 8c30047781..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > subq_3.metric_time__month - MAKE_INTERVAL(months => 3)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index 96c1cc7f0b..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > subq_12.metric_time__month - MAKE_INTERVAL(months => 3)
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 5bc9116fc1..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > DATEADD(month, -3, subq_3.metric_time__month)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index 4611f8316c..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > DATEADD(month, -3, subq_12.metric_time__month)
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 5bc9116fc1..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN '2020-03-05' AND '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN '2019-12-05' AND '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > DATEADD(month, -3, subq_3.metric_time__month)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index 4611f8316c..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-03-05' AND '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN '2019-12-05' AND '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > DATEADD(month, -3, subq_12.metric_time__month)
-  )
-WHERE subq_12.metric_time__month BETWEEN '2020-03-05' AND '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0.sql
deleted file mode 100644
index 8423ed8494..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0.sql
+++ /dev/null
@@ -1,136 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_8.metric_time__month
-  , subq_8.bookings_monthly AS trailing_3_months_bookings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_7.metric_time__month
-    , SUM(subq_7.bookings_monthly) AS bookings_monthly
-  FROM (
-    -- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
-    SELECT
-      subq_6.metric_time__month
-      , subq_6.bookings_monthly
-    FROM (
-      -- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
-      SELECT
-        subq_5.metric_time__month
-        , subq_5.bookings_monthly
-      FROM (
-        -- Join Self Over Time Range
-        SELECT
-          subq_3.metric_time__month AS metric_time__month
-          , subq_2.monthly_ds__month AS monthly_ds__month
-          , subq_2.monthly_ds__quarter AS monthly_ds__quarter
-          , subq_2.monthly_ds__year AS monthly_ds__year
-          , subq_2.monthly_ds__extract_year AS monthly_ds__extract_year
-          , subq_2.monthly_ds__extract_quarter AS monthly_ds__extract_quarter
-          , subq_2.monthly_ds__extract_month AS monthly_ds__extract_month
-          , subq_2.booking__monthly_ds__month AS booking__monthly_ds__month
-          , subq_2.booking__monthly_ds__quarter AS booking__monthly_ds__quarter
-          , subq_2.booking__monthly_ds__year AS booking__monthly_ds__year
-          , subq_2.booking__monthly_ds__extract_year AS booking__monthly_ds__extract_year
-          , subq_2.booking__monthly_ds__extract_quarter AS booking__monthly_ds__extract_quarter
-          , subq_2.booking__monthly_ds__extract_month AS booking__monthly_ds__extract_month
-          , subq_2.metric_time__quarter AS metric_time__quarter
-          , subq_2.metric_time__year AS metric_time__year
-          , subq_2.metric_time__extract_year AS metric_time__extract_year
-          , subq_2.metric_time__extract_quarter AS metric_time__extract_quarter
-          , subq_2.metric_time__extract_month AS metric_time__extract_month
-          , subq_2.listing AS listing
-          , subq_2.booking__listing AS booking__listing
-          , subq_2.bookings_monthly AS bookings_monthly
-        FROM (
-          -- Time Spine
-          SELECT
-            DATE_TRUNC('month', subq_4.ds) AS metric_time__month
-          FROM ***************************.mf_time_spine subq_4
-          WHERE subq_4.ds BETWEEN timestamp '2020-03-05' AND timestamp '2021-01-04'
-          GROUP BY
-            DATE_TRUNC('month', subq_4.ds)
-        ) subq_3
-        INNER JOIN (
-          -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-          SELECT
-            subq_1.monthly_ds__month
-            , subq_1.monthly_ds__quarter
-            , subq_1.monthly_ds__year
-            , subq_1.monthly_ds__extract_year
-            , subq_1.monthly_ds__extract_quarter
-            , subq_1.monthly_ds__extract_month
-            , subq_1.booking__monthly_ds__month
-            , subq_1.booking__monthly_ds__quarter
-            , subq_1.booking__monthly_ds__year
-            , subq_1.booking__monthly_ds__extract_year
-            , subq_1.booking__monthly_ds__extract_quarter
-            , subq_1.booking__monthly_ds__extract_month
-            , subq_1.metric_time__month
-            , subq_1.metric_time__quarter
-            , subq_1.metric_time__year
-            , subq_1.metric_time__extract_year
-            , subq_1.metric_time__extract_quarter
-            , subq_1.metric_time__extract_month
-            , subq_1.listing
-            , subq_1.booking__listing
-            , subq_1.bookings_monthly
-          FROM (
-            -- Metric Time Dimension 'monthly_ds'
-            SELECT
-              subq_0.monthly_ds__month
-              , subq_0.monthly_ds__quarter
-              , subq_0.monthly_ds__year
-              , subq_0.monthly_ds__extract_year
-              , subq_0.monthly_ds__extract_quarter
-              , subq_0.monthly_ds__extract_month
-              , subq_0.booking__monthly_ds__month
-              , subq_0.booking__monthly_ds__quarter
-              , subq_0.booking__monthly_ds__year
-              , subq_0.booking__monthly_ds__extract_year
-              , subq_0.booking__monthly_ds__extract_quarter
-              , subq_0.booking__monthly_ds__extract_month
-              , subq_0.monthly_ds__month AS metric_time__month
-              , subq_0.monthly_ds__quarter AS metric_time__quarter
-              , subq_0.monthly_ds__year AS metric_time__year
-              , subq_0.monthly_ds__extract_year AS metric_time__extract_year
-              , subq_0.monthly_ds__extract_quarter AS metric_time__extract_quarter
-              , subq_0.monthly_ds__extract_month AS metric_time__extract_month
-              , subq_0.listing
-              , subq_0.booking__listing
-              , subq_0.bookings_monthly
-            FROM (
-              -- Read Elements From Semantic Model 'bookings_monthly_source'
-              SELECT
-                bookings_monthly_source_src_16000.bookings_monthly
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS monthly_ds__extract_month
-                , DATE_TRUNC('month', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__month
-                , DATE_TRUNC('quarter', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__quarter
-                , DATE_TRUNC('year', bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__year
-                , EXTRACT(year FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_year
-                , EXTRACT(quarter FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_quarter
-                , EXTRACT(month FROM bookings_monthly_source_src_16000.ds) AS booking__monthly_ds__extract_month
-                , bookings_monthly_source_src_16000.listing_id AS listing
-                , bookings_monthly_source_src_16000.listing_id AS booking__listing
-              FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-            ) subq_0
-          ) subq_1
-          WHERE subq_1.metric_time__month BETWEEN timestamp '2019-12-05' AND timestamp '2021-01-04'
-        ) subq_2
-        ON
-          (
-            subq_2.metric_time__month <= subq_3.metric_time__month
-          ) AND (
-            subq_2.metric_time__month > DATE_ADD('month', -3, subq_3.metric_time__month)
-          )
-      ) subq_5
-    ) subq_6
-    WHERE subq_6.metric_time__month BETWEEN timestamp '2020-03-05' AND timestamp '2021-01-04'
-  ) subq_7
-  GROUP BY
-    subq_7.metric_time__month
-) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0_optimized.sql
deleted file mode 100644
index edd17f3f71..0000000000
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_month__plan0_optimized.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Join Self Over Time Range
--- Pass Only Elements: ['bookings_monthly', 'metric_time__month']
--- Constrain Time Range to [2020-03-05T00:00:00, 2021-01-04T00:00:00]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  subq_12.metric_time__month AS metric_time__month
-  , SUM(subq_11.bookings_monthly) AS trailing_3_months_bookings
-FROM (
-  -- Time Spine
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN timestamp '2020-03-05' AND timestamp '2021-01-04'
-  GROUP BY
-    DATE_TRUNC('month', ds)
-) subq_12
-INNER JOIN (
-  -- Read Elements From Semantic Model 'bookings_monthly_source'
-  -- Metric Time Dimension 'monthly_ds'
-  -- Constrain Time Range to [2019-12-05T00:00:00, 2021-01-04T00:00:00]
-  SELECT
-    DATE_TRUNC('month', ds) AS metric_time__month
-    , bookings_monthly
-  FROM ***************************.fct_bookings_extended_monthly bookings_monthly_source_src_16000
-  WHERE DATE_TRUNC('month', ds) BETWEEN timestamp '2019-12-05' AND timestamp '2021-01-04'
-) subq_11
-ON
-  (
-    subq_11.metric_time__month <= subq_12.metric_time__month
-  ) AND (
-    subq_11.metric_time__month > DATE_ADD('month', -3, subq_12.metric_time__month)
-  )
-WHERE subq_12.metric_time__month BETWEEN timestamp '2020-03-05' AND timestamp '2021-01-04'
-GROUP BY
-  subq_12.metric_time__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
deleted file mode 100644
index a56939c7ab..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
----
-<DataflowPlan>
-    <WriteToResultDataTableNode>
-        <!-- description = 'Write to DataTable' -->
-        <!-- node_id = NodeId(id_str='wrd_0') -->
-        <JoinToTimeSpineNode>
-            <!-- description = 'Join to Time Spine Dataset' -->
-            <!-- node_id = NodeId(id_str='jts_0') -->
-            <!-- requested_agg_time_dimension_specs =                                              -->
-            <!--   (                                                                               -->
-            <!--     TimeDimensionSpec(                                                            -->
-            <!--       element_name='metric_time',                                                 -->
-            <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
-            <!--     ),                                                                            -->
-            <!--   )                                                                               -->
-            <!-- join_type = INNER -->
-            <!-- offset_window = PydanticMetricTimeWindow(count=10, granularity='day') -->
-            <!-- time_range_constraint =                             -->
-            <!--   TimeRangeConstraint(                              -->
-            <!--     start_time=datetime.datetime(2020, 1, 1, 0, 0), -->
-            <!--     end_time=datetime.datetime(2021, 1, 1, 0, 0),   -->
-            <!--   )                                                 -->
-            <ComputeMetricsNode>
-                <!-- description = 'Compute Metrics via Expressions' -->
-                <!-- node_id = NodeId(id_str='cm_0') -->
-                <!-- metric_spec = MetricSpec(element_name='booking_fees', filter_spec_set=WhereFilterSpecSet()) -->
-                <AggregateMeasuresNode>
-                    <!-- description = 'Aggregate Measures' -->
-                    <!-- node_id = NodeId(id_str='am_0') -->
-                    <FilterElementsNode>
-                        <!-- description = "Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']" -->
-                        <!-- node_id = NodeId(id_str='pfe_0') -->
-                        <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                        <!-- include_spec =                                                                  -->
-                        <!--   TimeDimensionSpec(                                                            -->
-                        <!--     element_name='metric_time',                                                 -->
-                        <!--     time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
-                        <!--   )                                                                             -->
-                        <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                        <!-- distinct = False -->
-                        <MetricTimeDimensionTransformNode>
-                            <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_0') -->
-                            <!-- aggregation_time_dimension = 'ds' -->
-                            <ReadSqlSourceNode>
-                                <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_28001') -->
-                                <!-- data_set = SemanticModelDataSet('bookings_source') -->
-                            </ReadSqlSourceNode>
-                        </MetricTimeDimensionTransformNode>
-                    </FilterElementsNode>
-                </AggregateMeasuresNode>
-            </ComputeMetricsNode>
-        </JoinToTimeSpineNode>
-    </WriteToResultDataTableNode>
-</DataflowPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/BigQuery/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Databricks/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Postgres/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Redshift/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Snowflake/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_combine_output_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_combine_output_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_combine_output_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_combine_output_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_constrain_time_range_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_constrain_time_range_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_measure_aggregation_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_measure_aggregation_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_multi_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_multi_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_multi_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_multi_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_order_by_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_order_by_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_order_by_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_order_by_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_single_join_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_single_join_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_single_join_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_single_join_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_source_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_source_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_source_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/Trino/test_source_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_combine_output_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_combine_output_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_combine_output_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_combine_output_node__plan0.xml
index 19b5480225..671d2fb176 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_combine_output_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_combine_output_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Combine Aggregated Outputs' -->
         <!-- node_id = NodeId(id_str='ss_6') -->
@@ -868,4 +868,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node__plan0.xml
index d522f65c9a..37e57ea92c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_6') -->
@@ -782,4 +782,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
index f0baa97df0..27a1d242c7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_19') -->
@@ -3810,4 +3810,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
index 5ace78f424..c4819cb08b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_6') -->
@@ -790,4 +790,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_simple_expr__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_simple_expr__plan0.xml
index 6c968d42c8..a3adc2ff6c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Compute Metrics via Expressions' -->
         <!-- node_id = NodeId(id_str='ss_6') -->
@@ -787,4 +787,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_constrain_time_range_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_constrain_time_range_node__plan0.xml
index cd9265bcd2..a7701478d8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_constrain_time_range_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]' -->
         <!-- node_id = NodeId(id_str='ss_3') -->
@@ -420,4 +420,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimension_with_joined_where_constraint__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimension_with_joined_where_constraint__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimension_with_joined_where_constraint__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimension_with_joined_where_constraint__plan0.xml
index f62eb9045a..c126673619 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimension_with_joined_where_constraint__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimension_with_joined_where_constraint__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['user__home_state_latest',]" -->
         <!-- node_id = NodeId(id_str='ss_5') -->
@@ -809,4 +809,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
index 6be6b88b9a..ac5246820a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']" -->
         <!-- node_id = NodeId(id_str='ss_4') -->
@@ -554,4 +554,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_node__plan0.xml
index 407d6a5ac7..c1b49d300a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['bookings',]" -->
         <!-- node_id = NodeId(id_str='ss_1') -->
@@ -277,4 +277,4 @@ docstring:
             </SqlTableNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_with_where_constraint_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_with_where_constraint_node__plan0.xml
index fca353dc48..3b94490eb3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_filter_with_where_constraint_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Constrain Output with WHERE' -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -351,4 +351,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_measure_aggregation_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_measure_aggregation_node__plan0.xml
index 4fec493252..a220c5a00c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_measure_aggregation_node__plan0.xml
@@ -5,7 +5,7 @@ docstring:
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Aggregate Measures' -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -376,4 +376,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_multi_join_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_multi_join_node__plan0.xml
index 734eec9b59..9a90120bf2 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_multi_join_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Join Standard Outputs' -->
         <!-- node_id = NodeId(id_str='ss_6') -->
@@ -797,4 +797,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_order_by_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_order_by_node__plan0.xml
index da8bb7546e..181d419846 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_order_by_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Order By ['ds__day', 'bookings']" -->
         <!-- node_id = NodeId(id_str='ss_4') -->
@@ -484,4 +484,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node__plan0.xml
index 5c58c7cc8e..80e998f966 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Join on MIN(ds) and [] grouping by None' -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -377,4 +377,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_grouping__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_grouping__plan0.xml
index 9ac82f9fa0..5b52d49e2e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_grouping__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Join on MAX(ds) and ['user'] grouping by None" -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -379,4 +379,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
index 33a9066379..e999dba609 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Join on MIN(ds) and [] grouping by ds' -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -379,4 +379,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_single_join_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_single_join_node__plan0.xml
index bb0b3da4ba..bc6b7360ec 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_single_join_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Join Standard Outputs' -->
         <!-- node_id = NodeId(id_str='ss_4') -->
@@ -576,4 +576,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_source_node__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
rename to tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_source_node__plan0.xml
index 7b639ab929..28147f1890 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_source_node__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Read Elements From Semantic Model 'bookings_source'" -->
         <!-- node_id = NodeId(id_str='ss_0') -->
@@ -208,4 +208,4 @@ docstring:
             <!-- table_id = '***************************.fct_bookings' -->
         </SqlTableNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index 4df8d758f3..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_3
-) subq_4
-ON
-  DATETIME_TRUNC(subq_5.metric_time__day, month) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index 8021dfe263..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATETIME_TRUNC(ds, day) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_10
-) subq_11
-ON
-  DATETIME_TRUNC(subq_12.metric_time__day, month) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index 9fc075b289..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_3
-) subq_4
-ON
-  DATE_SUB(CAST(subq_5.metric_time__day AS DATETIME), INTERVAL 10 day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index 2189e020e3..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATETIME_TRUNC(ds, day) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_10
-) subq_11
-ON
-  DATE_SUB(CAST(subq_12.metric_time__day AS DATETIME), INTERVAL 10 day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index 5424e31422..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 984b3af893..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: BigQuery
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATETIME_TRUNC(ds, day) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      metric_time__day
-      , listing
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index 92aaf17edb..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index 2e994b1ca7..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index 12ed9c3f6a..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATEADD(day, -10, subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index 7c524cf73f..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATEADD(day, -10, subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index 8561d67453..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 1c84939389..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Databricks
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index c4b07e0720..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index 3703672d6c..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index ac5eda7945..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day - INTERVAL 10 day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index 1dd1a61b32..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day - INTERVAL 10 day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index 55c1b87b7b..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 8009b7050e..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: DuckDB
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index 00a246100b..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index bbc14654d9..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index 670e93234b..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day - MAKE_INTERVAL(days => 10) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index b005aa9ce6..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day - MAKE_INTERVAL(days => 10) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index e48511ce2d..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 5d4da2172c..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Postgres
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index f61871379f..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index 7b2b07eacd..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index cd6de2d08d..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATEADD(day, -10, subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index 8348c1f2f1..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATEADD(day, -10, subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index f7feeb920b..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 780438b419..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Redshift
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index 6d693092ad..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index 0dcb133599..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index 407334c8b9..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATEADD(day, -10, subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index 3f30bf8aeb..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATEADD(day, -10, subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index 4e4c8cb226..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index adbd8704b8..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Snowflake
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN '2020-01-01' AND '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
deleted file mode 100644
index 4e802b4682..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_TRUNC('month', subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
deleted file mode 100644
index ac1f49b723..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_to_grain
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_TRUNC('month', subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql
deleted file mode 100644
index fd109d984c..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  DATE_ADD('day', -10, subq_5.metric_time__day) = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
deleted file mode 100644
index c3b983909c..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_with_offset_window
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  DATE_ADD('day', -10, subq_12.metric_time__day) = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql
deleted file mode 100644
index 5b4ff11fdb..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_5.metric_time__day AS metric_time__day
-  , subq_4.listing AS listing
-  , subq_4.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    subq_6.ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_6
-  WHERE subq_6.ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_5
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    subq_3.metric_time__day
-    , subq_3.listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Aggregate Measures
-    SELECT
-      subq_2.metric_time__day
-      , subq_2.listing
-      , SUM(subq_2.booking_value) AS booking_value
-    FROM (
-      -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-      SELECT
-        subq_1.metric_time__day
-        , subq_1.listing
-        , subq_1.booking_value
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-    ) subq_2
-    GROUP BY
-      subq_2.metric_time__day
-      , subq_2.listing
-  ) subq_3
-) subq_4
-ON
-  subq_5.metric_time__day = subq_4.metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
deleted file mode 100644
index 9f03d9afb7..0000000000
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-test_name: test_join_to_time_spine_node_without_offset
-test_filename: test_dataflow_to_sql_plan.py
-docstring:
-  Tests JoinToTimeSpineNode for a single metric with offset_window.
-sql_engine: Trino
----
--- Join to Time Spine Dataset
-SELECT
-  subq_12.metric_time__day AS metric_time__day
-  , subq_11.listing AS listing
-  , subq_11.booking_fees AS booking_fees
-FROM (
-  -- Read From Time Spine 'mf_time_spine'
-  SELECT
-    ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_13
-  WHERE ds BETWEEN timestamp '2020-01-01' AND timestamp '2021-01-01'
-) subq_12
-INNER JOIN (
-  -- Compute Metrics via Expressions
-  SELECT
-    metric_time__day
-    , listing
-    , booking_value * 0.05 AS booking_fees
-  FROM (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['booking_value', 'metric_time__day', 'listing']
-    -- Aggregate Measures
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , listing_id AS listing
-      , SUM(booking_value) AS booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-      , listing_id
-  ) subq_10
-) subq_11
-ON
-  subq_12.metric_time__day = subq_11.metric_time__day
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_multi_metric_fill_null__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_multi_metric_fill_null__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml
index 53651eac9c..f0b59dfc12 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimension_values_with_a_join_and_a_filter__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']" -->
         <!-- node_id = NodeId(id_str='ss_5') -->
@@ -813,4 +813,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml
rename to tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
index 4eb4325ded..f5074b570b 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/test_dimensions_requiring_join__plan0.xml
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlPlan/test_dimensions_requiring_join__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']" -->
         <!-- node_id = NodeId(id_str='ss_4') -->
@@ -554,4 +554,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/BigQuery/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Databricks/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/DuckDB/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_discrete_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_discrete_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Postgres/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Redshift/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Snowflake/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_cast_to_timestamp__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_cast_to_timestamp__plan0.sql
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_generate_uuid__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql
rename to tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlPlan/Trino/test_generate_uuid__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_date_part__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_date_part__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0.sql
deleted file mode 100644
index 5c645875d6..0000000000
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0.sql
+++ /dev/null
@@ -1,591 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_4.metric_time__hour
-  , subq_4.archived_users
-FROM (
-  -- Aggregate Measures
-  SELECT
-    subq_3.metric_time__hour
-    , SUM(subq_3.archived_users) AS archived_users
-  FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__hour']
-    SELECT
-      subq_2.metric_time__hour
-      , subq_2.archived_users
-    FROM (
-      -- Constrain Time Range to [2020-01-01T00:00:02, 2020-01-01T00:00:08]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.created_at__day
-        , subq_1.created_at__week
-        , subq_1.created_at__month
-        , subq_1.created_at__quarter
-        , subq_1.created_at__year
-        , subq_1.created_at__extract_year
-        , subq_1.created_at__extract_quarter
-        , subq_1.created_at__extract_month
-        , subq_1.created_at__extract_day
-        , subq_1.created_at__extract_dow
-        , subq_1.created_at__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.last_profile_edit_ts__millisecond
-        , subq_1.last_profile_edit_ts__second
-        , subq_1.last_profile_edit_ts__minute
-        , subq_1.last_profile_edit_ts__hour
-        , subq_1.last_profile_edit_ts__day
-        , subq_1.last_profile_edit_ts__week
-        , subq_1.last_profile_edit_ts__month
-        , subq_1.last_profile_edit_ts__quarter
-        , subq_1.last_profile_edit_ts__year
-        , subq_1.last_profile_edit_ts__extract_year
-        , subq_1.last_profile_edit_ts__extract_quarter
-        , subq_1.last_profile_edit_ts__extract_month
-        , subq_1.last_profile_edit_ts__extract_day
-        , subq_1.last_profile_edit_ts__extract_dow
-        , subq_1.last_profile_edit_ts__extract_doy
-        , subq_1.bio_added_ts__second
-        , subq_1.bio_added_ts__minute
-        , subq_1.bio_added_ts__hour
-        , subq_1.bio_added_ts__day
-        , subq_1.bio_added_ts__week
-        , subq_1.bio_added_ts__month
-        , subq_1.bio_added_ts__quarter
-        , subq_1.bio_added_ts__year
-        , subq_1.bio_added_ts__extract_year
-        , subq_1.bio_added_ts__extract_quarter
-        , subq_1.bio_added_ts__extract_month
-        , subq_1.bio_added_ts__extract_day
-        , subq_1.bio_added_ts__extract_dow
-        , subq_1.bio_added_ts__extract_doy
-        , subq_1.last_login_ts__minute
-        , subq_1.last_login_ts__hour
-        , subq_1.last_login_ts__day
-        , subq_1.last_login_ts__week
-        , subq_1.last_login_ts__month
-        , subq_1.last_login_ts__quarter
-        , subq_1.last_login_ts__year
-        , subq_1.last_login_ts__extract_year
-        , subq_1.last_login_ts__extract_quarter
-        , subq_1.last_login_ts__extract_month
-        , subq_1.last_login_ts__extract_day
-        , subq_1.last_login_ts__extract_dow
-        , subq_1.last_login_ts__extract_doy
-        , subq_1.archived_at__hour
-        , subq_1.archived_at__day
-        , subq_1.archived_at__week
-        , subq_1.archived_at__month
-        , subq_1.archived_at__quarter
-        , subq_1.archived_at__year
-        , subq_1.archived_at__extract_year
-        , subq_1.archived_at__extract_quarter
-        , subq_1.archived_at__extract_month
-        , subq_1.archived_at__extract_day
-        , subq_1.archived_at__extract_dow
-        , subq_1.archived_at__extract_doy
-        , subq_1.user__ds__day
-        , subq_1.user__ds__week
-        , subq_1.user__ds__month
-        , subq_1.user__ds__quarter
-        , subq_1.user__ds__year
-        , subq_1.user__ds__extract_year
-        , subq_1.user__ds__extract_quarter
-        , subq_1.user__ds__extract_month
-        , subq_1.user__ds__extract_day
-        , subq_1.user__ds__extract_dow
-        , subq_1.user__ds__extract_doy
-        , subq_1.user__created_at__day
-        , subq_1.user__created_at__week
-        , subq_1.user__created_at__month
-        , subq_1.user__created_at__quarter
-        , subq_1.user__created_at__year
-        , subq_1.user__created_at__extract_year
-        , subq_1.user__created_at__extract_quarter
-        , subq_1.user__created_at__extract_month
-        , subq_1.user__created_at__extract_day
-        , subq_1.user__created_at__extract_dow
-        , subq_1.user__created_at__extract_doy
-        , subq_1.user__ds_partitioned__day
-        , subq_1.user__ds_partitioned__week
-        , subq_1.user__ds_partitioned__month
-        , subq_1.user__ds_partitioned__quarter
-        , subq_1.user__ds_partitioned__year
-        , subq_1.user__ds_partitioned__extract_year
-        , subq_1.user__ds_partitioned__extract_quarter
-        , subq_1.user__ds_partitioned__extract_month
-        , subq_1.user__ds_partitioned__extract_day
-        , subq_1.user__ds_partitioned__extract_dow
-        , subq_1.user__ds_partitioned__extract_doy
-        , subq_1.user__last_profile_edit_ts__millisecond
-        , subq_1.user__last_profile_edit_ts__second
-        , subq_1.user__last_profile_edit_ts__minute
-        , subq_1.user__last_profile_edit_ts__hour
-        , subq_1.user__last_profile_edit_ts__day
-        , subq_1.user__last_profile_edit_ts__week
-        , subq_1.user__last_profile_edit_ts__month
-        , subq_1.user__last_profile_edit_ts__quarter
-        , subq_1.user__last_profile_edit_ts__year
-        , subq_1.user__last_profile_edit_ts__extract_year
-        , subq_1.user__last_profile_edit_ts__extract_quarter
-        , subq_1.user__last_profile_edit_ts__extract_month
-        , subq_1.user__last_profile_edit_ts__extract_day
-        , subq_1.user__last_profile_edit_ts__extract_dow
-        , subq_1.user__last_profile_edit_ts__extract_doy
-        , subq_1.user__bio_added_ts__second
-        , subq_1.user__bio_added_ts__minute
-        , subq_1.user__bio_added_ts__hour
-        , subq_1.user__bio_added_ts__day
-        , subq_1.user__bio_added_ts__week
-        , subq_1.user__bio_added_ts__month
-        , subq_1.user__bio_added_ts__quarter
-        , subq_1.user__bio_added_ts__year
-        , subq_1.user__bio_added_ts__extract_year
-        , subq_1.user__bio_added_ts__extract_quarter
-        , subq_1.user__bio_added_ts__extract_month
-        , subq_1.user__bio_added_ts__extract_day
-        , subq_1.user__bio_added_ts__extract_dow
-        , subq_1.user__bio_added_ts__extract_doy
-        , subq_1.user__last_login_ts__minute
-        , subq_1.user__last_login_ts__hour
-        , subq_1.user__last_login_ts__day
-        , subq_1.user__last_login_ts__week
-        , subq_1.user__last_login_ts__month
-        , subq_1.user__last_login_ts__quarter
-        , subq_1.user__last_login_ts__year
-        , subq_1.user__last_login_ts__extract_year
-        , subq_1.user__last_login_ts__extract_quarter
-        , subq_1.user__last_login_ts__extract_month
-        , subq_1.user__last_login_ts__extract_day
-        , subq_1.user__last_login_ts__extract_dow
-        , subq_1.user__last_login_ts__extract_doy
-        , subq_1.user__archived_at__hour
-        , subq_1.user__archived_at__day
-        , subq_1.user__archived_at__week
-        , subq_1.user__archived_at__month
-        , subq_1.user__archived_at__quarter
-        , subq_1.user__archived_at__year
-        , subq_1.user__archived_at__extract_year
-        , subq_1.user__archived_at__extract_quarter
-        , subq_1.user__archived_at__extract_month
-        , subq_1.user__archived_at__extract_day
-        , subq_1.user__archived_at__extract_dow
-        , subq_1.user__archived_at__extract_doy
-        , subq_1.metric_time__hour
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.user
-        , subq_1.home_state
-        , subq_1.user__home_state
-        , subq_1.archived_users
-      FROM (
-        -- Metric Time Dimension 'archived_at'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.created_at__day
-          , subq_0.created_at__week
-          , subq_0.created_at__month
-          , subq_0.created_at__quarter
-          , subq_0.created_at__year
-          , subq_0.created_at__extract_year
-          , subq_0.created_at__extract_quarter
-          , subq_0.created_at__extract_month
-          , subq_0.created_at__extract_day
-          , subq_0.created_at__extract_dow
-          , subq_0.created_at__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.last_profile_edit_ts__millisecond
-          , subq_0.last_profile_edit_ts__second
-          , subq_0.last_profile_edit_ts__minute
-          , subq_0.last_profile_edit_ts__hour
-          , subq_0.last_profile_edit_ts__day
-          , subq_0.last_profile_edit_ts__week
-          , subq_0.last_profile_edit_ts__month
-          , subq_0.last_profile_edit_ts__quarter
-          , subq_0.last_profile_edit_ts__year
-          , subq_0.last_profile_edit_ts__extract_year
-          , subq_0.last_profile_edit_ts__extract_quarter
-          , subq_0.last_profile_edit_ts__extract_month
-          , subq_0.last_profile_edit_ts__extract_day
-          , subq_0.last_profile_edit_ts__extract_dow
-          , subq_0.last_profile_edit_ts__extract_doy
-          , subq_0.bio_added_ts__second
-          , subq_0.bio_added_ts__minute
-          , subq_0.bio_added_ts__hour
-          , subq_0.bio_added_ts__day
-          , subq_0.bio_added_ts__week
-          , subq_0.bio_added_ts__month
-          , subq_0.bio_added_ts__quarter
-          , subq_0.bio_added_ts__year
-          , subq_0.bio_added_ts__extract_year
-          , subq_0.bio_added_ts__extract_quarter
-          , subq_0.bio_added_ts__extract_month
-          , subq_0.bio_added_ts__extract_day
-          , subq_0.bio_added_ts__extract_dow
-          , subq_0.bio_added_ts__extract_doy
-          , subq_0.last_login_ts__minute
-          , subq_0.last_login_ts__hour
-          , subq_0.last_login_ts__day
-          , subq_0.last_login_ts__week
-          , subq_0.last_login_ts__month
-          , subq_0.last_login_ts__quarter
-          , subq_0.last_login_ts__year
-          , subq_0.last_login_ts__extract_year
-          , subq_0.last_login_ts__extract_quarter
-          , subq_0.last_login_ts__extract_month
-          , subq_0.last_login_ts__extract_day
-          , subq_0.last_login_ts__extract_dow
-          , subq_0.last_login_ts__extract_doy
-          , subq_0.archived_at__hour
-          , subq_0.archived_at__day
-          , subq_0.archived_at__week
-          , subq_0.archived_at__month
-          , subq_0.archived_at__quarter
-          , subq_0.archived_at__year
-          , subq_0.archived_at__extract_year
-          , subq_0.archived_at__extract_quarter
-          , subq_0.archived_at__extract_month
-          , subq_0.archived_at__extract_day
-          , subq_0.archived_at__extract_dow
-          , subq_0.archived_at__extract_doy
-          , subq_0.user__ds__day
-          , subq_0.user__ds__week
-          , subq_0.user__ds__month
-          , subq_0.user__ds__quarter
-          , subq_0.user__ds__year
-          , subq_0.user__ds__extract_year
-          , subq_0.user__ds__extract_quarter
-          , subq_0.user__ds__extract_month
-          , subq_0.user__ds__extract_day
-          , subq_0.user__ds__extract_dow
-          , subq_0.user__ds__extract_doy
-          , subq_0.user__created_at__day
-          , subq_0.user__created_at__week
-          , subq_0.user__created_at__month
-          , subq_0.user__created_at__quarter
-          , subq_0.user__created_at__year
-          , subq_0.user__created_at__extract_year
-          , subq_0.user__created_at__extract_quarter
-          , subq_0.user__created_at__extract_month
-          , subq_0.user__created_at__extract_day
-          , subq_0.user__created_at__extract_dow
-          , subq_0.user__created_at__extract_doy
-          , subq_0.user__ds_partitioned__day
-          , subq_0.user__ds_partitioned__week
-          , subq_0.user__ds_partitioned__month
-          , subq_0.user__ds_partitioned__quarter
-          , subq_0.user__ds_partitioned__year
-          , subq_0.user__ds_partitioned__extract_year
-          , subq_0.user__ds_partitioned__extract_quarter
-          , subq_0.user__ds_partitioned__extract_month
-          , subq_0.user__ds_partitioned__extract_day
-          , subq_0.user__ds_partitioned__extract_dow
-          , subq_0.user__ds_partitioned__extract_doy
-          , subq_0.user__last_profile_edit_ts__millisecond
-          , subq_0.user__last_profile_edit_ts__second
-          , subq_0.user__last_profile_edit_ts__minute
-          , subq_0.user__last_profile_edit_ts__hour
-          , subq_0.user__last_profile_edit_ts__day
-          , subq_0.user__last_profile_edit_ts__week
-          , subq_0.user__last_profile_edit_ts__month
-          , subq_0.user__last_profile_edit_ts__quarter
-          , subq_0.user__last_profile_edit_ts__year
-          , subq_0.user__last_profile_edit_ts__extract_year
-          , subq_0.user__last_profile_edit_ts__extract_quarter
-          , subq_0.user__last_profile_edit_ts__extract_month
-          , subq_0.user__last_profile_edit_ts__extract_day
-          , subq_0.user__last_profile_edit_ts__extract_dow
-          , subq_0.user__last_profile_edit_ts__extract_doy
-          , subq_0.user__bio_added_ts__second
-          , subq_0.user__bio_added_ts__minute
-          , subq_0.user__bio_added_ts__hour
-          , subq_0.user__bio_added_ts__day
-          , subq_0.user__bio_added_ts__week
-          , subq_0.user__bio_added_ts__month
-          , subq_0.user__bio_added_ts__quarter
-          , subq_0.user__bio_added_ts__year
-          , subq_0.user__bio_added_ts__extract_year
-          , subq_0.user__bio_added_ts__extract_quarter
-          , subq_0.user__bio_added_ts__extract_month
-          , subq_0.user__bio_added_ts__extract_day
-          , subq_0.user__bio_added_ts__extract_dow
-          , subq_0.user__bio_added_ts__extract_doy
-          , subq_0.user__last_login_ts__minute
-          , subq_0.user__last_login_ts__hour
-          , subq_0.user__last_login_ts__day
-          , subq_0.user__last_login_ts__week
-          , subq_0.user__last_login_ts__month
-          , subq_0.user__last_login_ts__quarter
-          , subq_0.user__last_login_ts__year
-          , subq_0.user__last_login_ts__extract_year
-          , subq_0.user__last_login_ts__extract_quarter
-          , subq_0.user__last_login_ts__extract_month
-          , subq_0.user__last_login_ts__extract_day
-          , subq_0.user__last_login_ts__extract_dow
-          , subq_0.user__last_login_ts__extract_doy
-          , subq_0.user__archived_at__hour
-          , subq_0.user__archived_at__day
-          , subq_0.user__archived_at__week
-          , subq_0.user__archived_at__month
-          , subq_0.user__archived_at__quarter
-          , subq_0.user__archived_at__year
-          , subq_0.user__archived_at__extract_year
-          , subq_0.user__archived_at__extract_quarter
-          , subq_0.user__archived_at__extract_month
-          , subq_0.user__archived_at__extract_day
-          , subq_0.user__archived_at__extract_dow
-          , subq_0.user__archived_at__extract_doy
-          , subq_0.archived_at__hour AS metric_time__hour
-          , subq_0.archived_at__day AS metric_time__day
-          , subq_0.archived_at__week AS metric_time__week
-          , subq_0.archived_at__month AS metric_time__month
-          , subq_0.archived_at__quarter AS metric_time__quarter
-          , subq_0.archived_at__year AS metric_time__year
-          , subq_0.archived_at__extract_year AS metric_time__extract_year
-          , subq_0.archived_at__extract_quarter AS metric_time__extract_quarter
-          , subq_0.archived_at__extract_month AS metric_time__extract_month
-          , subq_0.archived_at__extract_day AS metric_time__extract_day
-          , subq_0.archived_at__extract_dow AS metric_time__extract_dow
-          , subq_0.archived_at__extract_doy AS metric_time__extract_doy
-          , subq_0.user
-          , subq_0.home_state
-          , subq_0.user__home_state
-          , subq_0.archived_users
-        FROM (
-          -- Read Elements From Semantic Model 'users_ds_source'
-          SELECT
-            1 AS new_users
-            , 1 AS archived_users
-            , DATE_TRUNC('day', users_ds_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM users_ds_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', users_ds_source_src_28000.created_at) AS created_at__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.created_at) AS created_at__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.created_at) AS created_at__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.created_at) AS created_at__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.created_at) AS created_at__year
-            , EXTRACT(year FROM users_ds_source_src_28000.created_at) AS created_at__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.created_at) AS created_at__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.created_at) AS created_at__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.created_at) AS created_at__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.created_at) AS created_at__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.created_at) AS created_at__extract_doy
-            , DATE_TRUNC('day', users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , users_ds_source_src_28000.home_state
-            , DATE_TRUNC('millisecond', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__millisecond
-            , DATE_TRUNC('second', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__second
-            , DATE_TRUNC('minute', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.last_profile_edit_ts) AS last_profile_edit_ts__extract_doy
-            , DATE_TRUNC('second', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__second
-            , DATE_TRUNC('minute', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.bio_added_ts) AS bio_added_ts__extract_doy
-            , DATE_TRUNC('minute', users_ds_source_src_28000.last_login_ts) AS last_login_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.last_login_ts) AS last_login_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.last_login_ts) AS last_login_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.last_login_ts) AS last_login_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.last_login_ts) AS last_login_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.last_login_ts) AS last_login_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.last_login_ts) AS last_login_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.last_login_ts) AS last_login_ts__extract_doy
-            , DATE_TRUNC('hour', users_ds_source_src_28000.archived_at) AS archived_at__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.archived_at) AS archived_at__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.archived_at) AS archived_at__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.archived_at) AS archived_at__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.archived_at) AS archived_at__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.archived_at) AS archived_at__year
-            , EXTRACT(year FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.archived_at) AS archived_at__extract_doy
-            , DATE_TRUNC('day', users_ds_source_src_28000.ds) AS user__ds__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.ds) AS user__ds__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.ds) AS user__ds__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.ds) AS user__ds__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.ds) AS user__ds__year
-            , EXTRACT(year FROM users_ds_source_src_28000.ds) AS user__ds__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.ds) AS user__ds__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.ds) AS user__ds__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.ds) AS user__ds__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.ds) AS user__ds__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.ds) AS user__ds__extract_doy
-            , DATE_TRUNC('day', users_ds_source_src_28000.created_at) AS user__created_at__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.created_at) AS user__created_at__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.created_at) AS user__created_at__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.created_at) AS user__created_at__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.created_at) AS user__created_at__year
-            , EXTRACT(year FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.created_at) AS user__created_at__extract_doy
-            , DATE_TRUNC('day', users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(year FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.ds_partitioned) AS user__ds_partitioned__extract_doy
-            , users_ds_source_src_28000.home_state AS user__home_state
-            , DATE_TRUNC('millisecond', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__millisecond
-            , DATE_TRUNC('second', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__second
-            , DATE_TRUNC('minute', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.last_profile_edit_ts) AS user__last_profile_edit_ts__extract_doy
-            , DATE_TRUNC('second', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__second
-            , DATE_TRUNC('minute', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__extract_doy
-            , DATE_TRUNC('minute', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__minute
-            , DATE_TRUNC('hour', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__year
-            , EXTRACT(year FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.last_login_ts) AS user__last_login_ts__extract_doy
-            , DATE_TRUNC('hour', users_ds_source_src_28000.archived_at) AS user__archived_at__hour
-            , DATE_TRUNC('day', users_ds_source_src_28000.archived_at) AS user__archived_at__day
-            , DATE_TRUNC('week', users_ds_source_src_28000.archived_at) AS user__archived_at__week
-            , DATE_TRUNC('month', users_ds_source_src_28000.archived_at) AS user__archived_at__month
-            , DATE_TRUNC('quarter', users_ds_source_src_28000.archived_at) AS user__archived_at__quarter
-            , DATE_TRUNC('year', users_ds_source_src_28000.archived_at) AS user__archived_at__year
-            , EXTRACT(year FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_year
-            , EXTRACT(quarter FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_quarter
-            , EXTRACT(month FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_month
-            , EXTRACT(day FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_day
-            , EXTRACT(isodow FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_dow
-            , EXTRACT(doy FROM users_ds_source_src_28000.archived_at) AS user__archived_at__extract_doy
-            , users_ds_source_src_28000.user_id AS user
-          FROM ***************************.dim_users users_ds_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__hour BETWEEN '2020-01-01 00:00:02' AND '2020-01-01 00:00:08'
-    ) subq_2
-  ) subq_3
-  GROUP BY
-    subq_3.metric_time__hour
-) subq_4
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0_optimized.sql
deleted file mode 100644
index 7fba204225..0000000000
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_adjusted__plan0_optimized.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  metric_time__hour
-  , SUM(archived_users) AS archived_users
-FROM (
-  -- Read Elements From Semantic Model 'users_ds_source'
-  -- Metric Time Dimension 'archived_at'
-  -- Constrain Time Range to [2020-01-01T00:00:02, 2020-01-01T00:00:08]
-  -- Pass Only Elements: ['archived_users', 'metric_time__hour']
-  SELECT
-    DATE_TRUNC('hour', archived_at) AS metric_time__hour
-    , 1 AS archived_users
-  FROM ***************************.dim_users users_ds_source_src_28000
-  WHERE DATE_TRUNC('hour', archived_at) BETWEEN '2020-01-01 00:00:02' AND '2020-01-01 00:00:08'
-) subq_8
-GROUP BY
-  metric_time__hour
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_with_conversion_metric__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_with_conversion_metric__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_multi_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_multi_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_single_hop__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_single_hop__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_filtered_by_itself__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_filtered_by_itself__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index b065bf8cea..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, day) AS ds__day
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, isoweek) AS ds__week
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, month) AS ds__month
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, quarter) AS ds__quarter
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, year) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , IF(EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) = 1, 7, EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) - 1) AS ds__extract_dow
-                  , EXTRACT(dayofyear FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, day) AS created_at__day
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, isoweek) AS created_at__week
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, month) AS created_at__month
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, quarter) AS created_at__quarter
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, year) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , IF(EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) = 1, 7, EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) - 1) AS created_at__extract_dow
-                  , EXTRACT(dayofyear FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, day) AS listing__ds__day
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, isoweek) AS listing__ds__week
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, month) AS listing__ds__month
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, quarter) AS listing__ds__quarter
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, year) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , IF(EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) = 1, 7, EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) - 1) AS listing__ds__extract_dow
-                  , EXTRACT(dayofyear FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, day) AS listing__created_at__day
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, isoweek) AS listing__created_at__week
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, month) AS listing__created_at__month
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, quarter) AS listing__created_at__quarter
-                  , DATE_TRUNC(listings_latest_src_28000.created_at, year) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , IF(EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) = 1, 7, EXTRACT(dayofweek FROM listings_latest_src_28000.created_at) - 1) AS listing__created_at__extract_dow
-                  , EXTRACT(dayofyear FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC(views_source_src_28000.ds, day) AS ds__day
-                        , DATE_TRUNC(views_source_src_28000.ds, isoweek) AS ds__week
-                        , DATE_TRUNC(views_source_src_28000.ds, month) AS ds__month
-                        , DATE_TRUNC(views_source_src_28000.ds, quarter) AS ds__quarter
-                        , DATE_TRUNC(views_source_src_28000.ds, year) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM views_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM views_source_src_28000.ds) - 1) AS ds__extract_dow
-                        , EXTRACT(dayofyear FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , IF(EXTRACT(dayofweek FROM views_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM views_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-                        , EXTRACT(dayofyear FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC(views_source_src_28000.ds, day) AS view__ds__day
-                        , DATE_TRUNC(views_source_src_28000.ds, isoweek) AS view__ds__week
-                        , DATE_TRUNC(views_source_src_28000.ds, month) AS view__ds__month
-                        , DATE_TRUNC(views_source_src_28000.ds, quarter) AS view__ds__quarter
-                        , DATE_TRUNC(views_source_src_28000.ds, year) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM views_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM views_source_src_28000.ds) - 1) AS view__ds__extract_dow
-                        , EXTRACT(dayofyear FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, day) AS view__ds_partitioned__day
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, isoweek) AS view__ds_partitioned__week
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, month) AS view__ds_partitioned__month
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, quarter) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC(views_source_src_28000.ds_partitioned, year) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , IF(EXTRACT(dayofweek FROM views_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM views_source_src_28000.ds_partitioned) - 1) AS view__ds_partitioned__extract_dow
-                        , EXTRACT(dayofyear FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index 48166518d4..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK_ISO FROM listings_latest_src_28000.created_at) AS ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK_ISO FROM listings_latest_src_28000.created_at) AS created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK_ISO FROM listings_latest_src_28000.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK_ISO FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM views_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS view__ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS view__ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS view__ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS view__ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM views_source_src_28000.ds) AS view__ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  subq_9.view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index bad0eaba6e..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , EXTRACT(isodow FROM listings_latest_src_28000.created_at) AS ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , EXTRACT(isodow FROM listings_latest_src_28000.created_at) AS created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , EXTRACT(isodow FROM listings_latest_src_28000.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(isodow FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM views_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , EXTRACT(isodow FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS view__ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS view__ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS view__ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS view__ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , EXTRACT(isodow FROM views_source_src_28000.ds) AS view__ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , EXTRACT(isodow FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  subq_9.view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index 265016f5c8..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , CASE WHEN EXTRACT(dow FROM listings_latest_src_28000.created_at) = 0 THEN EXTRACT(dow FROM listings_latest_src_28000.created_at) + 7 ELSE EXTRACT(dow FROM listings_latest_src_28000.created_at) END AS ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , CASE WHEN EXTRACT(dow FROM listings_latest_src_28000.created_at) = 0 THEN EXTRACT(dow FROM listings_latest_src_28000.created_at) + 7 ELSE EXTRACT(dow FROM listings_latest_src_28000.created_at) END AS created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , CASE WHEN EXTRACT(dow FROM listings_latest_src_28000.created_at) = 0 THEN EXTRACT(dow FROM listings_latest_src_28000.created_at) + 7 ELSE EXTRACT(dow FROM listings_latest_src_28000.created_at) END AS listing__ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , CASE WHEN EXTRACT(dow FROM listings_latest_src_28000.created_at) = 0 THEN EXTRACT(dow FROM listings_latest_src_28000.created_at) + 7 ELSE EXTRACT(dow FROM listings_latest_src_28000.created_at) END AS listing__created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM views_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM views_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM views_source_src_28000.ds) END AS ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , CASE WHEN EXTRACT(dow FROM views_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM views_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM views_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS view__ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS view__ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS view__ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS view__ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM views_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM views_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM views_source_src_28000.ds) END AS view__ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , CASE WHEN EXTRACT(dow FROM views_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM views_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM views_source_src_28000.ds_partitioned) END AS view__ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  subq_9.view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index 466cc2f2ae..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , EXTRACT(dayofweekiso FROM listings_latest_src_28000.created_at) AS ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , EXTRACT(dayofweekiso FROM listings_latest_src_28000.created_at) AS created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , EXTRACT(dayofweekiso FROM listings_latest_src_28000.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(dayofweekiso FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(dayofweekiso FROM views_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , EXTRACT(dayofweekiso FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS view__ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS view__ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS view__ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS view__ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , EXTRACT(dayofweekiso FROM views_source_src_28000.ds) AS view__ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , EXTRACT(dayofweekiso FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  subq_9.view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0.sql
deleted file mode 100644
index 15a6d447b3..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_17.listings
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_16.listings) AS listings
-  FROM (
-    -- Pass Only Elements: ['listings',]
-    SELECT
-      subq_15.listings
-    FROM (
-      -- Constrain Output with WHERE
-      SELECT
-        subq_14.listing__view__listing__views
-        , subq_14.listings
-      FROM (
-        -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-        SELECT
-          subq_13.listing__view__listing__views
-          , subq_13.listings
-        FROM (
-          -- Join Standard Outputs
-          SELECT
-            subq_6.listing AS listing
-            , subq_12.view__listing AS listing__view__listing
-            , subq_12.view__listing__views AS listing__view__listing__views
-            , subq_6.listings AS listings
-          FROM (
-            -- Pass Only Elements: ['listings', 'listing']
-            SELECT
-              subq_5.listing
-              , subq_5.listings
-            FROM (
-              -- Metric Time Dimension 'ds'
-              SELECT
-                subq_4.ds__day
-                , subq_4.ds__week
-                , subq_4.ds__month
-                , subq_4.ds__quarter
-                , subq_4.ds__year
-                , subq_4.ds__extract_year
-                , subq_4.ds__extract_quarter
-                , subq_4.ds__extract_month
-                , subq_4.ds__extract_day
-                , subq_4.ds__extract_dow
-                , subq_4.ds__extract_doy
-                , subq_4.created_at__day
-                , subq_4.created_at__week
-                , subq_4.created_at__month
-                , subq_4.created_at__quarter
-                , subq_4.created_at__year
-                , subq_4.created_at__extract_year
-                , subq_4.created_at__extract_quarter
-                , subq_4.created_at__extract_month
-                , subq_4.created_at__extract_day
-                , subq_4.created_at__extract_dow
-                , subq_4.created_at__extract_doy
-                , subq_4.listing__ds__day
-                , subq_4.listing__ds__week
-                , subq_4.listing__ds__month
-                , subq_4.listing__ds__quarter
-                , subq_4.listing__ds__year
-                , subq_4.listing__ds__extract_year
-                , subq_4.listing__ds__extract_quarter
-                , subq_4.listing__ds__extract_month
-                , subq_4.listing__ds__extract_day
-                , subq_4.listing__ds__extract_dow
-                , subq_4.listing__ds__extract_doy
-                , subq_4.listing__created_at__day
-                , subq_4.listing__created_at__week
-                , subq_4.listing__created_at__month
-                , subq_4.listing__created_at__quarter
-                , subq_4.listing__created_at__year
-                , subq_4.listing__created_at__extract_year
-                , subq_4.listing__created_at__extract_quarter
-                , subq_4.listing__created_at__extract_month
-                , subq_4.listing__created_at__extract_day
-                , subq_4.listing__created_at__extract_dow
-                , subq_4.listing__created_at__extract_doy
-                , subq_4.ds__day AS metric_time__day
-                , subq_4.ds__week AS metric_time__week
-                , subq_4.ds__month AS metric_time__month
-                , subq_4.ds__quarter AS metric_time__quarter
-                , subq_4.ds__year AS metric_time__year
-                , subq_4.ds__extract_year AS metric_time__extract_year
-                , subq_4.ds__extract_quarter AS metric_time__extract_quarter
-                , subq_4.ds__extract_month AS metric_time__extract_month
-                , subq_4.ds__extract_day AS metric_time__extract_day
-                , subq_4.ds__extract_dow AS metric_time__extract_dow
-                , subq_4.ds__extract_doy AS metric_time__extract_doy
-                , subq_4.listing
-                , subq_4.user
-                , subq_4.listing__user
-                , subq_4.country_latest
-                , subq_4.is_lux_latest
-                , subq_4.capacity_latest
-                , subq_4.listing__country_latest
-                , subq_4.listing__is_lux_latest
-                , subq_4.listing__capacity_latest
-                , subq_4.listings
-                , subq_4.largest_listing
-                , subq_4.smallest_listing
-              FROM (
-                -- Read Elements From Semantic Model 'listings_latest'
-                SELECT
-                  1 AS listings
-                  , listings_latest_src_28000.capacity AS largest_listing
-                  , listings_latest_src_28000.capacity AS smallest_listing
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS ds__extract_day
-                  , EXTRACT(DAY_OF_WEEK FROM listings_latest_src_28000.created_at) AS ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS created_at__extract_day
-                  , EXTRACT(DAY_OF_WEEK FROM listings_latest_src_28000.created_at) AS created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS created_at__extract_doy
-                  , listings_latest_src_28000.country AS country_latest
-                  , listings_latest_src_28000.is_lux AS is_lux_latest
-                  , listings_latest_src_28000.capacity AS capacity_latest
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__ds__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__ds__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__ds__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__ds__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__ds__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__ds__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAY_OF_WEEK FROM listings_latest_src_28000.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__ds__extract_doy
-                  , DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__created_at__day
-                  , DATE_TRUNC('week', listings_latest_src_28000.created_at) AS listing__created_at__week
-                  , DATE_TRUNC('month', listings_latest_src_28000.created_at) AS listing__created_at__month
-                  , DATE_TRUNC('quarter', listings_latest_src_28000.created_at) AS listing__created_at__quarter
-                  , DATE_TRUNC('year', listings_latest_src_28000.created_at) AS listing__created_at__year
-                  , EXTRACT(year FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(quarter FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(month FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(day FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAY_OF_WEEK FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(doy FROM listings_latest_src_28000.created_at) AS listing__created_at__extract_doy
-                  , listings_latest_src_28000.country AS listing__country_latest
-                  , listings_latest_src_28000.is_lux AS listing__is_lux_latest
-                  , listings_latest_src_28000.capacity AS listing__capacity_latest
-                  , listings_latest_src_28000.listing_id AS listing
-                  , listings_latest_src_28000.user_id AS user
-                  , listings_latest_src_28000.user_id AS listing__user
-                FROM ***************************.dim_listings_latest listings_latest_src_28000
-              ) subq_4
-            ) subq_5
-          ) subq_6
-          LEFT OUTER JOIN (
-            -- Pass Only Elements: ['view__listing', 'view__listing__views']
-            SELECT
-              subq_11.view__listing
-              , subq_11.view__listing__views
-            FROM (
-              -- Compute Metrics via Expressions
-              SELECT
-                subq_10.view__listing
-                , subq_10.views AS view__listing__views
-              FROM (
-                -- Aggregate Measures
-                SELECT
-                  subq_9.view__listing
-                  , SUM(subq_9.views) AS views
-                FROM (
-                  -- Pass Only Elements: ['views', 'view__listing']
-                  SELECT
-                    subq_8.view__listing
-                    , subq_8.views
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_7.ds__day
-                      , subq_7.ds__week
-                      , subq_7.ds__month
-                      , subq_7.ds__quarter
-                      , subq_7.ds__year
-                      , subq_7.ds__extract_year
-                      , subq_7.ds__extract_quarter
-                      , subq_7.ds__extract_month
-                      , subq_7.ds__extract_day
-                      , subq_7.ds__extract_dow
-                      , subq_7.ds__extract_doy
-                      , subq_7.ds_partitioned__day
-                      , subq_7.ds_partitioned__week
-                      , subq_7.ds_partitioned__month
-                      , subq_7.ds_partitioned__quarter
-                      , subq_7.ds_partitioned__year
-                      , subq_7.ds_partitioned__extract_year
-                      , subq_7.ds_partitioned__extract_quarter
-                      , subq_7.ds_partitioned__extract_month
-                      , subq_7.ds_partitioned__extract_day
-                      , subq_7.ds_partitioned__extract_dow
-                      , subq_7.ds_partitioned__extract_doy
-                      , subq_7.view__ds__day
-                      , subq_7.view__ds__week
-                      , subq_7.view__ds__month
-                      , subq_7.view__ds__quarter
-                      , subq_7.view__ds__year
-                      , subq_7.view__ds__extract_year
-                      , subq_7.view__ds__extract_quarter
-                      , subq_7.view__ds__extract_month
-                      , subq_7.view__ds__extract_day
-                      , subq_7.view__ds__extract_dow
-                      , subq_7.view__ds__extract_doy
-                      , subq_7.view__ds_partitioned__day
-                      , subq_7.view__ds_partitioned__week
-                      , subq_7.view__ds_partitioned__month
-                      , subq_7.view__ds_partitioned__quarter
-                      , subq_7.view__ds_partitioned__year
-                      , subq_7.view__ds_partitioned__extract_year
-                      , subq_7.view__ds_partitioned__extract_quarter
-                      , subq_7.view__ds_partitioned__extract_month
-                      , subq_7.view__ds_partitioned__extract_day
-                      , subq_7.view__ds_partitioned__extract_dow
-                      , subq_7.view__ds_partitioned__extract_doy
-                      , subq_7.ds__day AS metric_time__day
-                      , subq_7.ds__week AS metric_time__week
-                      , subq_7.ds__month AS metric_time__month
-                      , subq_7.ds__quarter AS metric_time__quarter
-                      , subq_7.ds__year AS metric_time__year
-                      , subq_7.ds__extract_year AS metric_time__extract_year
-                      , subq_7.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_7.ds__extract_month AS metric_time__extract_month
-                      , subq_7.ds__extract_day AS metric_time__extract_day
-                      , subq_7.ds__extract_dow AS metric_time__extract_dow
-                      , subq_7.ds__extract_doy AS metric_time__extract_doy
-                      , subq_7.listing
-                      , subq_7.user
-                      , subq_7.view__listing
-                      , subq_7.view__user
-                      , subq_7.views
-                    FROM (
-                      -- Read Elements From Semantic Model 'views_source'
-                      SELECT
-                        1 AS views
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM views_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds) AS view__ds__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds) AS view__ds__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds) AS view__ds__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds) AS view__ds__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds) AS view__ds__year
-                        , EXTRACT(year FROM views_source_src_28000.ds) AS view__ds__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds) AS view__ds__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds) AS view__ds__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds) AS view__ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM views_source_src_28000.ds) AS view__ds__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds) AS view__ds__extract_doy
-                        , DATE_TRUNC('day', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__day
-                        , DATE_TRUNC('week', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__week
-                        , DATE_TRUNC('month', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__month
-                        , DATE_TRUNC('quarter', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__quarter
-                        , DATE_TRUNC('year', views_source_src_28000.ds_partitioned) AS view__ds_partitioned__year
-                        , EXTRACT(year FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_year
-                        , EXTRACT(quarter FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                        , EXTRACT(month FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_month
-                        , EXTRACT(day FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_dow
-                        , EXTRACT(doy FROM views_source_src_28000.ds_partitioned) AS view__ds_partitioned__extract_doy
-                        , views_source_src_28000.listing_id AS listing
-                        , views_source_src_28000.user_id AS user
-                        , views_source_src_28000.listing_id AS view__listing
-                        , views_source_src_28000.user_id AS view__user
-                      FROM ***************************.fct_views views_source_src_28000
-                    ) subq_7
-                  ) subq_8
-                ) subq_9
-                GROUP BY
-                  subq_9.view__listing
-              ) subq_10
-            ) subq_11
-          ) subq_12
-          ON
-            subq_6.listing = subq_12.view__listing
-        ) subq_13
-      ) subq_14
-      WHERE listing__view__listing__views > 2
-    ) subq_15
-  ) subq_16
-) subq_17
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
deleted file mode 100644
index 05fd368fbd..0000000000
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix2__plan0_optimized.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Constrain Output with WHERE
--- Pass Only Elements: ['listings',]
--- Aggregate Measures
--- Compute Metrics via Expressions
-SELECT
-  SUM(listings) AS listings
-FROM (
-  -- Join Standard Outputs
-  -- Pass Only Elements: ['listings', 'listing__view__listing__views']
-  SELECT
-    subq_26.view__listing__views AS listing__view__listing__views
-    , subq_20.listings AS listings
-  FROM (
-    -- Read Elements From Semantic Model 'listings_latest'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['listings', 'listing']
-    SELECT
-      listing_id AS listing
-      , 1 AS listings
-    FROM ***************************.dim_listings_latest listings_latest_src_28000
-  ) subq_20
-  LEFT OUTER JOIN (
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['view__listing', 'view__listing__views']
-    SELECT
-      view__listing
-      , SUM(views) AS view__listing__views
-    FROM (
-      -- Read Elements From Semantic Model 'views_source'
-      -- Metric Time Dimension 'ds'
-      -- Pass Only Elements: ['views', 'view__listing']
-      SELECT
-        listing_id AS view__listing
-        , 1 AS views
-      FROM ***************************.fct_views views_source_src_28000
-    ) subq_23
-    GROUP BY
-      view__listing
-  ) subq_26
-  ON
-    subq_20.listing = subq_26.view__listing
-) subq_28
-WHERE listing__view__listing__views > 2
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
index 96087f7fa0..f3d81d80c6 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Metric Time Dimension 'paid_at'" -->
         <!-- node_id = NodeId(id_str='ss_1') -->
@@ -499,4 +499,4 @@ docstring:
             </SqlTableNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
index be3af86f1a..527a8de5c5 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Metric Time Dimension 'ds'" -->
         <!-- node_id = NodeId(id_str='ss_1') -->
@@ -526,4 +526,4 @@ docstring:
             </SqlTableNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_simple_query_with_metric_time_dimension__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_simple_query_with_metric_time_dimension__plan0.xml
index 1a3ac497e3..68b7d5c3b7 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlPlan/test_simple_query_with_metric_time_dimension__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = 'Combine Aggregated Outputs' -->
         <!-- node_id = NodeId(id_str='ss_10') -->
@@ -1897,4 +1897,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_dimensions_with_time_constraint__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_dimensions_with_time_constraint__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
index b4130ba0db..e3406b7374 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_dimensions_with_time_constraint__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
@@ -1,7 +1,7 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description =                                                                                     -->
         <!--   "Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']" -->
@@ -1018,4 +1018,4 @@ test_filename: test_metric_time_without_metrics.py
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_only__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_only__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
index 8a132b16bb..3eecfbcfdc 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_only__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
@@ -3,7 +3,7 @@ test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['metric_time__day',]" -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -115,4 +115,4 @@ docstring:
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_quarter_alone__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_quarter_alone__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
index c219fcdab9..7695a4dcac 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_quarter_alone__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
@@ -1,7 +1,7 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description = "Pass Only Elements: ['metric_time__quarter',]" -->
         <!-- node_id = NodeId(id_str='ss_2') -->
@@ -114,4 +114,4 @@ test_filename: test_metric_time_without_metrics.py
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_with_other_dimensions__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
similarity index 99%
rename from tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_with_other_dimensions__plan0.xml
rename to tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
index 581a156b02..67ca175e3a 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/test_metric_time_with_other_dimensions__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
@@ -1,7 +1,7 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
 ---
-<SqlQueryPlan>
+<SqlPlan>
     <SqlSelectStatementNode>
         <!-- description =                                                                                     -->
         <!--   "Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']" -->
@@ -745,4 +745,4 @@ test_filename: test_metric_time_without_metrics.py
             </SqlSelectStatementNode>
         </SqlSelectStatementNode>
     </SqlSelectStatementNode>
-</SqlQueryPlan>
+</SqlPlan>
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfp_0.xml
deleted file mode 100644
index 47819ffdbb..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfp_0.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<DataflowPlan>
-    <WriteToResultDataTableNode>
-        <!-- description = 'Write to DataTable' -->
-        <!-- node_id = NodeId(id_str='wrd_0') -->
-        <ComputeMetricsNode>
-            <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_2') -->
-            <!-- metric_spec =                                                        -->
-            <!--   MetricSpec(                                                        -->
-            <!--     element_name='views_times_booking_value',                        -->
-            <!--     filter_specs=(                                                   -->
-            <!--       WhereFilterSpec(                                               -->
-            <!--         where_sql='listing__is_lux_latest',                          -->
-            <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
-            <!--         linkable_elements=(                                          -->
-            <!--           LinkableDimension(                                         -->
-            <!--             defined_in_semantic_model=SemanticModelReference(        -->
-            <!--               semantic_model_name='listings_latest',                 -->
-            <!--             ),                                                       -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             dimension_type=CATEGORICAL,                              -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--             join_path=SemanticModelJoinPath(                         -->
-            <!--               left_semantic_model_reference=SemanticModelReference(  -->
-            <!--                 semantic_model_name='bookings_source',               -->
-            <!--               ),                                                     -->
-            <!--               path_elements=(                                        -->
-            <!--                 SemanticModelJoinPathElement(                        -->
-            <!--                   semantic_model_reference=SemanticModelReference(   -->
-            <!--                     semantic_model_name='listings_latest',           -->
-            <!--                   ),                                                 -->
-            <!--                   join_on_entity=EntityReference(                    -->
-            <!--                     element_name='listing',                          -->
-            <!--                   ),                                                 -->
-            <!--                 ),                                                   -->
-            <!--               ),                                                     -->
-            <!--             ),                                                       -->
-            <!--             properties=frozenset('JOINED',),                         -->
-            <!--           ),                                                         -->
-            <!--           LinkableDimension(                                         -->
-            <!--             defined_in_semantic_model=SemanticModelReference(        -->
-            <!--               semantic_model_name='listings_latest',                 -->
-            <!--             ),                                                       -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             dimension_type=CATEGORICAL,                              -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--             join_path=SemanticModelJoinPath(                         -->
-            <!--               left_semantic_model_reference=SemanticModelReference(  -->
-            <!--                 semantic_model_name='views_source',                  -->
-            <!--               ),                                                     -->
-            <!--               path_elements=(                                        -->
-            <!--                 SemanticModelJoinPathElement(                        -->
-            <!--                   semantic_model_reference=SemanticModelReference(   -->
-            <!--                     semantic_model_name='listings_latest',           -->
-            <!--                   ),                                                 -->
-            <!--                   join_on_entity=EntityReference(                    -->
-            <!--                     element_name='listing',                          -->
-            <!--                   ),                                                 -->
-            <!--                 ),                                                   -->
-            <!--               ),                                                     -->
-            <!--             ),                                                       -->
-            <!--             properties=frozenset('JOINED',),                         -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
-            <!--       ),                                                             -->
-            <!--     ),                                                               -->
-            <!--   )                                                                  -->
-            <CombineAggregatedOutputsNode>
-                <!-- description = 'Combine Aggregated Outputs' -->
-                <!-- node_id = NodeId(id_str='cao_0') -->
-                <ComputeMetricsNode>
-                    <!-- description = 'Compute Metrics via Expressions' -->
-                    <!-- node_id = NodeId(id_str='cm_0') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='booking_value',                                    -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='listing__is_lux_latest',                          -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='views_source',                  -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
-                    <AggregateMeasuresNode>
-                        <!-- description = 'Aggregate Measures' -->
-                        <!-- node_id = NodeId(id_str='am_0') -->
-                        <FilterElementsNode>
-                            <!-- description = "Pass Only Elements: ['booking_value',]" -->
-                            <!-- node_id = NodeId(id_str='pfe_3') -->
-                            <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                            <!-- distinct = False -->
-                            <WhereConstraintNode>
-                                <!-- description = 'Constrain Output with WHERE' -->
-                                <!-- node_id = NodeId(id_str='wcc_0') -->
-                                <!-- where_condition =                                                -->
-                                <!--   WhereFilterSpec(                                               -->
-                                <!--     where_sql='listing__is_lux_latest',                          -->
-                                <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--     linkable_elements=(                                          -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='bookings_source',               -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='views_source',                  -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--   )                                                              -->
-                                <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['booking_value', 'listing__is_lux_latest']" -->
-                                    <!-- node_id = NodeId(id_str='pfe_2') -->
-                                    <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                                    <!-- include_spec =                                               -->
-                                    <!--   DimensionSpec(                                             -->
-                                    <!--     element_name='is_lux_latest',                            -->
-                                    <!--     entity_links=(EntityReference(element_name='listing'),), -->
-                                    <!--   )                                                          -->
-                                    <!-- distinct = False -->
-                                    <JoinOnEntitiesNode>
-                                        <!-- description = 'Join Standard Outputs' -->
-                                        <!-- node_id = NodeId(id_str='jso_0') -->
-                                        <!-- join0_for_node_id_pfe_1 =                                      -->
-                                        <!--   JoinDescription(                                             -->
-                                        <!--     join_node=FilterElementsNode(node_id=pfe_1),               -->
-                                        <!--     join_on_entity=LinklessEntitySpec(element_name='listing'), -->
-                                        <!--     join_type=LEFT_OUTER,                                      -->
-                                        <!--   )                                                            -->
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['booking_value', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_0') -->
-                                            <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28002') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('bookings_source')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_28014') -->
-                                                    <!-- data_set = SemanticModelDataSet('bookings_source') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['is_lux_latest', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_1') -->
-                                            <!-- include_spec = DimensionSpec(element_name='is_lux_latest') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28006') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('listings_latest')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_28018') -->
-                                                    <!-- data_set = SemanticModelDataSet('listings_latest') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                    </JoinOnEntitiesNode>
-                                </FilterElementsNode>
-                            </WhereConstraintNode>
-                        </FilterElementsNode>
-                    </AggregateMeasuresNode>
-                </ComputeMetricsNode>
-                <ComputeMetricsNode>
-                    <!-- description = 'Compute Metrics via Expressions' -->
-                    <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='views',                                            -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='listing__is_lux_latest',                          -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='views_source',                  -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
-                    <AggregateMeasuresNode>
-                        <!-- description = 'Aggregate Measures' -->
-                        <!-- node_id = NodeId(id_str='am_1') -->
-                        <FilterElementsNode>
-                            <!-- description = "Pass Only Elements: ['views',]" -->
-                            <!-- node_id = NodeId(id_str='pfe_7') -->
-                            <!-- include_spec = MeasureSpec(element_name='views') -->
-                            <!-- distinct = False -->
-                            <WhereConstraintNode>
-                                <!-- description = 'Constrain Output with WHERE' -->
-                                <!-- node_id = NodeId(id_str='wcc_1') -->
-                                <!-- where_condition =                                                -->
-                                <!--   WhereFilterSpec(                                               -->
-                                <!--     where_sql='listing__is_lux_latest',                          -->
-                                <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--     linkable_elements=(                                          -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='bookings_source',               -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='views_source',                  -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--   )                                                              -->
-                                <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['views', 'listing__is_lux_latest']" -->
-                                    <!-- node_id = NodeId(id_str='pfe_6') -->
-                                    <!-- include_spec = MeasureSpec(element_name='views') -->
-                                    <!-- include_spec =                                               -->
-                                    <!--   DimensionSpec(                                             -->
-                                    <!--     element_name='is_lux_latest',                            -->
-                                    <!--     entity_links=(EntityReference(element_name='listing'),), -->
-                                    <!--   )                                                          -->
-                                    <!-- distinct = False -->
-                                    <JoinOnEntitiesNode>
-                                        <!-- description = 'Join Standard Outputs' -->
-                                        <!-- node_id = NodeId(id_str='jso_1') -->
-                                        <!-- join0_for_node_id_pfe_5 =                                      -->
-                                        <!--   JoinDescription(                                             -->
-                                        <!--     join_node=FilterElementsNode(node_id=pfe_5),               -->
-                                        <!--     join_on_entity=LinklessEntitySpec(element_name='listing'), -->
-                                        <!--     join_type=LEFT_OUTER,                                      -->
-                                        <!--   )                                                            -->
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['views', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_4') -->
-                                            <!-- include_spec = MeasureSpec(element_name='views') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28008') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description = "Read From SemanticModelDataSet('views_source')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_28023') -->
-                                                    <!-- data_set = SemanticModelDataSet('views_source') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['is_lux_latest', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_5') -->
-                                            <!-- include_spec = DimensionSpec(element_name='is_lux_latest') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28006') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('listings_latest')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_28018') -->
-                                                    <!-- data_set = SemanticModelDataSet('listings_latest') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                    </JoinOnEntitiesNode>
-                                </FilterElementsNode>
-                            </WhereConstraintNode>
-                        </FilterElementsNode>
-                    </AggregateMeasuresNode>
-                </ComputeMetricsNode>
-            </CombineAggregatedOutputsNode>
-        </ComputeMetricsNode>
-    </WriteToResultDataTableNode>
-</DataflowPlan>
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfpo_0.xml
deleted file mode 100644
index e8db2fca59..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_aggregate_output_join_metric_predicate_pushdown__dfpo_0.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<DataflowPlan>
-    <WriteToResultDataTableNode>
-        <!-- description = 'Write to DataTable' -->
-        <!-- node_id = NodeId(id_str='wrd_1') -->
-        <ComputeMetricsNode>
-            <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_5') -->
-            <!-- metric_spec =                                                        -->
-            <!--   MetricSpec(                                                        -->
-            <!--     element_name='views_times_booking_value',                        -->
-            <!--     filter_specs=(                                                   -->
-            <!--       WhereFilterSpec(                                               -->
-            <!--         where_sql='listing__is_lux_latest',                          -->
-            <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
-            <!--         linkable_elements=(                                          -->
-            <!--           LinkableDimension(                                         -->
-            <!--             defined_in_semantic_model=SemanticModelReference(        -->
-            <!--               semantic_model_name='listings_latest',                 -->
-            <!--             ),                                                       -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             dimension_type=CATEGORICAL,                              -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--             join_path=SemanticModelJoinPath(                         -->
-            <!--               left_semantic_model_reference=SemanticModelReference(  -->
-            <!--                 semantic_model_name='bookings_source',               -->
-            <!--               ),                                                     -->
-            <!--               path_elements=(                                        -->
-            <!--                 SemanticModelJoinPathElement(                        -->
-            <!--                   semantic_model_reference=SemanticModelReference(   -->
-            <!--                     semantic_model_name='listings_latest',           -->
-            <!--                   ),                                                 -->
-            <!--                   join_on_entity=EntityReference(                    -->
-            <!--                     element_name='listing',                          -->
-            <!--                   ),                                                 -->
-            <!--                 ),                                                   -->
-            <!--               ),                                                     -->
-            <!--             ),                                                       -->
-            <!--             properties=frozenset('JOINED',),                         -->
-            <!--           ),                                                         -->
-            <!--           LinkableDimension(                                         -->
-            <!--             defined_in_semantic_model=SemanticModelReference(        -->
-            <!--               semantic_model_name='listings_latest',                 -->
-            <!--             ),                                                       -->
-            <!--             element_name='is_lux_latest',                            -->
-            <!--             dimension_type=CATEGORICAL,                              -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--             join_path=SemanticModelJoinPath(                         -->
-            <!--               left_semantic_model_reference=SemanticModelReference(  -->
-            <!--                 semantic_model_name='views_source',                  -->
-            <!--               ),                                                     -->
-            <!--               path_elements=(                                        -->
-            <!--                 SemanticModelJoinPathElement(                        -->
-            <!--                   semantic_model_reference=SemanticModelReference(   -->
-            <!--                     semantic_model_name='listings_latest',           -->
-            <!--                   ),                                                 -->
-            <!--                   join_on_entity=EntityReference(                    -->
-            <!--                     element_name='listing',                          -->
-            <!--                   ),                                                 -->
-            <!--                 ),                                                   -->
-            <!--               ),                                                     -->
-            <!--             ),                                                       -->
-            <!--             properties=frozenset('JOINED',),                         -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
-            <!--       ),                                                             -->
-            <!--     ),                                                               -->
-            <!--   )                                                                  -->
-            <CombineAggregatedOutputsNode>
-                <!-- description = 'Combine Aggregated Outputs' -->
-                <!-- node_id = NodeId(id_str='cao_1') -->
-                <ComputeMetricsNode>
-                    <!-- description = 'Compute Metrics via Expressions' -->
-                    <!-- node_id = NodeId(id_str='cm_3') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='booking_value',                                    -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='listing__is_lux_latest',                          -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='views_source',                  -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
-                    <AggregateMeasuresNode>
-                        <!-- description = 'Aggregate Measures' -->
-                        <!-- node_id = NodeId(id_str='am_2') -->
-                        <FilterElementsNode>
-                            <!-- description = "Pass Only Elements: ['booking_value',]" -->
-                            <!-- node_id = NodeId(id_str='pfe_11') -->
-                            <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                            <!-- distinct = False -->
-                            <WhereConstraintNode>
-                                <!-- description = 'Constrain Output with WHERE' -->
-                                <!-- node_id = NodeId(id_str='wcc_2') -->
-                                <!-- where_condition =                                                -->
-                                <!--   WhereFilterSpec(                                               -->
-                                <!--     where_sql='listing__is_lux_latest',                          -->
-                                <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--     linkable_elements=(                                          -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='bookings_source',               -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='views_source',                  -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--   )                                                              -->
-                                <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['booking_value', 'listing__is_lux_latest']" -->
-                                    <!-- node_id = NodeId(id_str='pfe_10') -->
-                                    <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                                    <!-- include_spec =                                               -->
-                                    <!--   DimensionSpec(                                             -->
-                                    <!--     element_name='is_lux_latest',                            -->
-                                    <!--     entity_links=(EntityReference(element_name='listing'),), -->
-                                    <!--   )                                                          -->
-                                    <!-- distinct = False -->
-                                    <JoinOnEntitiesNode>
-                                        <!-- description = 'Join Standard Outputs' -->
-                                        <!-- node_id = NodeId(id_str='jso_2') -->
-                                        <!-- join0_for_node_id_pfe_9 =                                      -->
-                                        <!--   JoinDescription(                                             -->
-                                        <!--     join_node=FilterElementsNode(node_id=pfe_9),               -->
-                                        <!--     join_on_entity=LinklessEntitySpec(element_name='listing'), -->
-                                        <!--     join_type=LEFT_OUTER,                                      -->
-                                        <!--   )                                                            -->
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['booking_value', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_8') -->
-                                            <!-- include_spec = MeasureSpec(element_name='booking_value') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_0') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('bookings_source')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_0') -->
-                                                    <!-- data_set = SemanticModelDataSet('bookings_source') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['is_lux_latest', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_9') -->
-                                            <!-- include_spec = DimensionSpec(element_name='is_lux_latest') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_1') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('listings_latest')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_1') -->
-                                                    <!-- data_set = SemanticModelDataSet('listings_latest') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                    </JoinOnEntitiesNode>
-                                </FilterElementsNode>
-                            </WhereConstraintNode>
-                        </FilterElementsNode>
-                    </AggregateMeasuresNode>
-                </ComputeMetricsNode>
-                <ComputeMetricsNode>
-                    <!-- description = 'Compute Metrics via Expressions' -->
-                    <!-- node_id = NodeId(id_str='cm_4') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='views',                                            -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='listing__is_lux_latest',                          -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='views_source',                  -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
-                    <AggregateMeasuresNode>
-                        <!-- description = 'Aggregate Measures' -->
-                        <!-- node_id = NodeId(id_str='am_3') -->
-                        <FilterElementsNode>
-                            <!-- description = "Pass Only Elements: ['views',]" -->
-                            <!-- node_id = NodeId(id_str='pfe_15') -->
-                            <!-- include_spec = MeasureSpec(element_name='views') -->
-                            <!-- distinct = False -->
-                            <WhereConstraintNode>
-                                <!-- description = 'Constrain Output with WHERE' -->
-                                <!-- node_id = NodeId(id_str='wcc_3') -->
-                                <!-- where_condition =                                                -->
-                                <!--   WhereFilterSpec(                                               -->
-                                <!--     where_sql='listing__is_lux_latest',                          -->
-                                <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--     linkable_elements=(                                          -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='bookings_source',               -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--       LinkableDimension(                                         -->
-                                <!--         defined_in_semantic_model=SemanticModelReference(        -->
-                                <!--           semantic_model_name='listings_latest',                 -->
-                                <!--         ),                                                       -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         dimension_type=CATEGORICAL,                              -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--         join_path=SemanticModelJoinPath(                         -->
-                                <!--           left_semantic_model_reference=SemanticModelReference(  -->
-                                <!--             semantic_model_name='views_source',                  -->
-                                <!--           ),                                                     -->
-                                <!--           path_elements=(                                        -->
-                                <!--             SemanticModelJoinPathElement(                        -->
-                                <!--               semantic_model_reference=SemanticModelReference(   -->
-                                <!--                 semantic_model_name='listings_latest',           -->
-                                <!--               ),                                                 -->
-                                <!--               join_on_entity=EntityReference(                    -->
-                                <!--                 element_name='listing',                          -->
-                                <!--               ),                                                 -->
-                                <!--             ),                                                   -->
-                                <!--           ),                                                     -->
-                                <!--         ),                                                       -->
-                                <!--         properties=frozenset('JOINED',),                         -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
-                                <!--   )                                                              -->
-                                <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['views', 'listing__is_lux_latest']" -->
-                                    <!-- node_id = NodeId(id_str='pfe_14') -->
-                                    <!-- include_spec = MeasureSpec(element_name='views') -->
-                                    <!-- include_spec =                                               -->
-                                    <!--   DimensionSpec(                                             -->
-                                    <!--     element_name='is_lux_latest',                            -->
-                                    <!--     entity_links=(EntityReference(element_name='listing'),), -->
-                                    <!--   )                                                          -->
-                                    <!-- distinct = False -->
-                                    <JoinOnEntitiesNode>
-                                        <!-- description = 'Join Standard Outputs' -->
-                                        <!-- node_id = NodeId(id_str='jso_3') -->
-                                        <!-- join0_for_node_id_pfe_13 =                                     -->
-                                        <!--   JoinDescription(                                             -->
-                                        <!--     join_node=FilterElementsNode(node_id=pfe_13),              -->
-                                        <!--     join_on_entity=LinklessEntitySpec(element_name='listing'), -->
-                                        <!--     join_type=LEFT_OUTER,                                      -->
-                                        <!--   )                                                            -->
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['views', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_12') -->
-                                            <!-- include_spec = MeasureSpec(element_name='views') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_2') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description = "Read From SemanticModelDataSet('views_source')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_2') -->
-                                                    <!-- data_set = SemanticModelDataSet('views_source') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                        <FilterElementsNode>
-                                            <!-- description = "Pass Only Elements: ['is_lux_latest', 'listing']" -->
-                                            <!-- node_id = NodeId(id_str='pfe_13') -->
-                                            <!-- include_spec = DimensionSpec(element_name='is_lux_latest') -->
-                                            <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
-                                            <!-- distinct = False -->
-                                            <MetricTimeDimensionTransformNode>
-                                                <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_3') -->
-                                                <!-- aggregation_time_dimension = 'ds' -->
-                                                <ReadSqlSourceNode>
-                                                    <!-- description =                                         -->
-                                                    <!--   "Read From SemanticModelDataSet('listings_latest')" -->
-                                                    <!-- node_id = NodeId(id_str='rss_3') -->
-                                                    <!-- data_set = SemanticModelDataSet('listings_latest') -->
-                                                </ReadSqlSourceNode>
-                                            </MetricTimeDimensionTransformNode>
-                                        </FilterElementsNode>
-                                    </JoinOnEntitiesNode>
-                                </FilterElementsNode>
-                            </WhereConstraintNode>
-                        </FilterElementsNode>
-                    </AggregateMeasuresNode>
-                </ComputeMetricsNode>
-            </CombineAggregatedOutputsNode>
-        </ComputeMetricsNode>
-    </WriteToResultDataTableNode>
-</DataflowPlan>
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_conversion_metric_query_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_conversion_metric_query_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_skipped_pushdown__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_skipped_pushdown__plan0.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index 23583eeea0..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS FLOAT64) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS FLOAT64) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS ds__week
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS ds__month
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS ds__quarter
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS ds__extract_dow
-                        , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS account__ds__day
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS account__ds__week
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS account__ds__month
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS account__ds__quarter
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS account__ds__extract_dow
-                        , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATETIME_TRUNC(users_latest_src_28000.ds, day) AS ds_latest__day
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS ds_latest__week
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS ds_latest__month
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS ds_latest__quarter
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS ds_latest__extract_dow
-                      , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, day) AS user__ds_latest__day
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS user__ds_latest__week
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS user__ds_latest__month
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS user__ds_latest__quarter
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS user__ds_latest__extract_dow
-                      , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS ds__week
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS ds__month
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS ds__quarter
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS ds__extract_dow
-                          , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS account__ds__day
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS account__ds__week
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS account__ds__month
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS account__ds__quarter
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS account__ds__extract_dow
-                          , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATETIME_TRUNC(users_latest_src_28000.ds, day) AS ds_latest__day
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS ds_latest__week
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS ds_latest__month
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS ds_latest__quarter
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS ds_latest__extract_dow
-                        , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, day) AS user__ds_latest__day
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS user__ds_latest__week
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS user__ds_latest__month
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS user__ds_latest__quarter
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS user__ds_latest__extract_dow
-                        , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS ds__week
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS ds__month
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS ds__quarter
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS ds__extract_dow
-                        , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS account__ds__day
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS account__ds__week
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS account__ds__month
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS account__ds__quarter
-                        , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS account__ds__extract_dow
-                        , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATETIME_TRUNC(users_latest_src_28000.ds, day) AS ds_latest__day
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS ds_latest__week
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS ds_latest__month
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS ds_latest__quarter
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS ds_latest__extract_dow
-                      , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, day) AS user__ds_latest__day
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS user__ds_latest__week
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS user__ds_latest__month
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS user__ds_latest__quarter
-                      , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS user__ds_latest__extract_dow
-                      , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS ds__week
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS ds__month
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS ds__quarter
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS ds__extract_dow
-                          , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS account__ds__day
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, isoweek) AS account__ds__week
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, month) AS account__ds__month
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, quarter) AS account__ds__quarter
-                          , DATETIME_TRUNC(accounts_source_src_28000.ds, year) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , IF(EXTRACT(dayofweek FROM accounts_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM accounts_source_src_28000.ds) - 1) AS account__ds__extract_dow
-                          , EXTRACT(dayofyear FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATETIME_TRUNC(users_latest_src_28000.ds, day) AS ds_latest__day
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS ds_latest__week
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS ds_latest__month
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS ds_latest__quarter
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS ds_latest__extract_dow
-                        , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, day) AS user__ds_latest__day
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, isoweek) AS user__ds_latest__week
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, month) AS user__ds_latest__month
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, quarter) AS user__ds_latest__quarter
-                        , DATETIME_TRUNC(users_latest_src_28000.ds, year) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , IF(EXTRACT(dayofweek FROM users_latest_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM users_latest_src_28000.ds) - 1) AS user__ds_latest__extract_dow
-                        , EXTRACT(dayofyear FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 84e58ea333..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS FLOAT64) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS FLOAT64) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATETIME_TRUNC(accounts_source_src_28000.ds, day) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index 64ffc315e3..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS FLOAT64) / CAST(NULLIF(subq_19.max_booking_value, 0) AS FLOAT64) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-                    , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-                    , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-              , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-              , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    metric_time__day
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 73efe99bfc..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS FLOAT64) / CAST(NULLIF(max_booking_value, 0) AS FLOAT64) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATETIME_TRUNC(ds, day) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATETIME_TRUNC(ds, day) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      metric_time__day
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    metric_time__day
-) subq_33
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index 9022b49e18..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(DAYOFWEEK_ISO FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(DAYOFWEEK_ISO FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 44eac537d1..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index eba0dec278..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS DOUBLE) / CAST(NULLIF(subq_19.max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        subq_11.metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        subq_16.metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day)
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 111a82caa8..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day)
-) subq_33
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index a4d7c09a3c..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 44eac537d1..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index 8088d8d684..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_15.metric_time__day
-  , CAST(subq_15.average_booking_value AS DOUBLE) / CAST(NULLIF(subq_15.max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_9.metric_time__day, subq_14.metric_time__day) AS metric_time__day
-    , MAX(subq_9.average_booking_value) AS average_booking_value
-    , MAX(subq_14.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_8.metric_time__day
-      , subq_8.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_7.metric_time__day
-        , AVG(subq_7.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_6.metric_time__day
-          , subq_6.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_5.metric_time__day
-            , subq_5.booking__is_instant
-            , subq_5.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_4.metric_time__day
-              , subq_4.booking__is_instant
-              , subq_4.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_3.ds__day
-                , subq_3.ds__week
-                , subq_3.ds__month
-                , subq_3.ds__quarter
-                , subq_3.ds__year
-                , subq_3.ds__extract_year
-                , subq_3.ds__extract_quarter
-                , subq_3.ds__extract_month
-                , subq_3.ds__extract_day
-                , subq_3.ds__extract_dow
-                , subq_3.ds__extract_doy
-                , subq_3.ds_partitioned__day
-                , subq_3.ds_partitioned__week
-                , subq_3.ds_partitioned__month
-                , subq_3.ds_partitioned__quarter
-                , subq_3.ds_partitioned__year
-                , subq_3.ds_partitioned__extract_year
-                , subq_3.ds_partitioned__extract_quarter
-                , subq_3.ds_partitioned__extract_month
-                , subq_3.ds_partitioned__extract_day
-                , subq_3.ds_partitioned__extract_dow
-                , subq_3.ds_partitioned__extract_doy
-                , subq_3.paid_at__day
-                , subq_3.paid_at__week
-                , subq_3.paid_at__month
-                , subq_3.paid_at__quarter
-                , subq_3.paid_at__year
-                , subq_3.paid_at__extract_year
-                , subq_3.paid_at__extract_quarter
-                , subq_3.paid_at__extract_month
-                , subq_3.paid_at__extract_day
-                , subq_3.paid_at__extract_dow
-                , subq_3.paid_at__extract_doy
-                , subq_3.booking__ds__day
-                , subq_3.booking__ds__week
-                , subq_3.booking__ds__month
-                , subq_3.booking__ds__quarter
-                , subq_3.booking__ds__year
-                , subq_3.booking__ds__extract_year
-                , subq_3.booking__ds__extract_quarter
-                , subq_3.booking__ds__extract_month
-                , subq_3.booking__ds__extract_day
-                , subq_3.booking__ds__extract_dow
-                , subq_3.booking__ds__extract_doy
-                , subq_3.booking__ds_partitioned__day
-                , subq_3.booking__ds_partitioned__week
-                , subq_3.booking__ds_partitioned__month
-                , subq_3.booking__ds_partitioned__quarter
-                , subq_3.booking__ds_partitioned__year
-                , subq_3.booking__ds_partitioned__extract_year
-                , subq_3.booking__ds_partitioned__extract_quarter
-                , subq_3.booking__ds_partitioned__extract_month
-                , subq_3.booking__ds_partitioned__extract_day
-                , subq_3.booking__ds_partitioned__extract_dow
-                , subq_3.booking__ds_partitioned__extract_doy
-                , subq_3.booking__paid_at__day
-                , subq_3.booking__paid_at__week
-                , subq_3.booking__paid_at__month
-                , subq_3.booking__paid_at__quarter
-                , subq_3.booking__paid_at__year
-                , subq_3.booking__paid_at__extract_year
-                , subq_3.booking__paid_at__extract_quarter
-                , subq_3.booking__paid_at__extract_month
-                , subq_3.booking__paid_at__extract_day
-                , subq_3.booking__paid_at__extract_dow
-                , subq_3.booking__paid_at__extract_doy
-                , subq_3.metric_time__day
-                , subq_3.metric_time__week
-                , subq_3.metric_time__month
-                , subq_3.metric_time__quarter
-                , subq_3.metric_time__year
-                , subq_3.metric_time__extract_year
-                , subq_3.metric_time__extract_quarter
-                , subq_3.metric_time__extract_month
-                , subq_3.metric_time__extract_day
-                , subq_3.metric_time__extract_dow
-                , subq_3.metric_time__extract_doy
-                , subq_3.listing
-                , subq_3.guest
-                , subq_3.host
-                , subq_3.booking__listing
-                , subq_3.booking__guest
-                , subq_3.booking__host
-                , subq_3.is_instant
-                , subq_3.booking__is_instant
-                , subq_3.bookings
-                , subq_3.instant_bookings
-                , subq_3.booking_value
-                , subq_3.max_booking_value
-                , subq_3.min_booking_value
-                , subq_3.bookers
-                , subq_3.average_booking_value
-                , subq_3.referred_bookings
-                , subq_3.median_booking_value
-                , subq_3.booking_value_p99
-                , subq_3.discrete_booking_value_p99
-                , subq_3.approximate_continuous_booking_value_p99
-                , subq_3.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_2.ds__day
-                  , subq_2.ds__week
-                  , subq_2.ds__month
-                  , subq_2.ds__quarter
-                  , subq_2.ds__year
-                  , subq_2.ds__extract_year
-                  , subq_2.ds__extract_quarter
-                  , subq_2.ds__extract_month
-                  , subq_2.ds__extract_day
-                  , subq_2.ds__extract_dow
-                  , subq_2.ds__extract_doy
-                  , subq_2.ds_partitioned__day
-                  , subq_2.ds_partitioned__week
-                  , subq_2.ds_partitioned__month
-                  , subq_2.ds_partitioned__quarter
-                  , subq_2.ds_partitioned__year
-                  , subq_2.ds_partitioned__extract_year
-                  , subq_2.ds_partitioned__extract_quarter
-                  , subq_2.ds_partitioned__extract_month
-                  , subq_2.ds_partitioned__extract_day
-                  , subq_2.ds_partitioned__extract_dow
-                  , subq_2.ds_partitioned__extract_doy
-                  , subq_2.paid_at__day
-                  , subq_2.paid_at__week
-                  , subq_2.paid_at__month
-                  , subq_2.paid_at__quarter
-                  , subq_2.paid_at__year
-                  , subq_2.paid_at__extract_year
-                  , subq_2.paid_at__extract_quarter
-                  , subq_2.paid_at__extract_month
-                  , subq_2.paid_at__extract_day
-                  , subq_2.paid_at__extract_dow
-                  , subq_2.paid_at__extract_doy
-                  , subq_2.booking__ds__day
-                  , subq_2.booking__ds__week
-                  , subq_2.booking__ds__month
-                  , subq_2.booking__ds__quarter
-                  , subq_2.booking__ds__year
-                  , subq_2.booking__ds__extract_year
-                  , subq_2.booking__ds__extract_quarter
-                  , subq_2.booking__ds__extract_month
-                  , subq_2.booking__ds__extract_day
-                  , subq_2.booking__ds__extract_dow
-                  , subq_2.booking__ds__extract_doy
-                  , subq_2.booking__ds_partitioned__day
-                  , subq_2.booking__ds_partitioned__week
-                  , subq_2.booking__ds_partitioned__month
-                  , subq_2.booking__ds_partitioned__quarter
-                  , subq_2.booking__ds_partitioned__year
-                  , subq_2.booking__ds_partitioned__extract_year
-                  , subq_2.booking__ds_partitioned__extract_quarter
-                  , subq_2.booking__ds_partitioned__extract_month
-                  , subq_2.booking__ds_partitioned__extract_day
-                  , subq_2.booking__ds_partitioned__extract_dow
-                  , subq_2.booking__ds_partitioned__extract_doy
-                  , subq_2.booking__paid_at__day
-                  , subq_2.booking__paid_at__week
-                  , subq_2.booking__paid_at__month
-                  , subq_2.booking__paid_at__quarter
-                  , subq_2.booking__paid_at__year
-                  , subq_2.booking__paid_at__extract_year
-                  , subq_2.booking__paid_at__extract_quarter
-                  , subq_2.booking__paid_at__extract_month
-                  , subq_2.booking__paid_at__extract_day
-                  , subq_2.booking__paid_at__extract_dow
-                  , subq_2.booking__paid_at__extract_doy
-                  , subq_2.ds__day AS metric_time__day
-                  , subq_2.ds__week AS metric_time__week
-                  , subq_2.ds__month AS metric_time__month
-                  , subq_2.ds__quarter AS metric_time__quarter
-                  , subq_2.ds__year AS metric_time__year
-                  , subq_2.ds__extract_year AS metric_time__extract_year
-                  , subq_2.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_2.ds__extract_month AS metric_time__extract_month
-                  , subq_2.ds__extract_day AS metric_time__extract_day
-                  , subq_2.ds__extract_dow AS metric_time__extract_dow
-                  , subq_2.ds__extract_doy AS metric_time__extract_doy
-                  , subq_2.listing
-                  , subq_2.guest
-                  , subq_2.host
-                  , subq_2.booking__listing
-                  , subq_2.booking__guest
-                  , subq_2.booking__host
-                  , subq_2.is_instant
-                  , subq_2.booking__is_instant
-                  , subq_2.bookings
-                  , subq_2.instant_bookings
-                  , subq_2.booking_value
-                  , subq_2.max_booking_value
-                  , subq_2.min_booking_value
-                  , subq_2.bookers
-                  , subq_2.average_booking_value
-                  , subq_2.referred_bookings
-                  , subq_2.median_booking_value
-                  , subq_2.booking_value_p99
-                  , subq_2.discrete_booking_value_p99
-                  , subq_2.approximate_continuous_booking_value_p99
-                  , subq_2.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_2
-              ) subq_3
-              WHERE booking__is_instant
-            ) subq_4
-          ) subq_5
-          WHERE booking__is_instant
-        ) subq_6
-      ) subq_7
-      GROUP BY
-        subq_7.metric_time__day
-    ) subq_8
-  ) subq_9
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_13.metric_time__day
-      , subq_13.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_12.metric_time__day
-        , MAX(subq_12.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_11.metric_time__day
-          , subq_11.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_10.ds__day
-            , subq_10.ds__week
-            , subq_10.ds__month
-            , subq_10.ds__quarter
-            , subq_10.ds__year
-            , subq_10.ds__extract_year
-            , subq_10.ds__extract_quarter
-            , subq_10.ds__extract_month
-            , subq_10.ds__extract_day
-            , subq_10.ds__extract_dow
-            , subq_10.ds__extract_doy
-            , subq_10.ds_partitioned__day
-            , subq_10.ds_partitioned__week
-            , subq_10.ds_partitioned__month
-            , subq_10.ds_partitioned__quarter
-            , subq_10.ds_partitioned__year
-            , subq_10.ds_partitioned__extract_year
-            , subq_10.ds_partitioned__extract_quarter
-            , subq_10.ds_partitioned__extract_month
-            , subq_10.ds_partitioned__extract_day
-            , subq_10.ds_partitioned__extract_dow
-            , subq_10.ds_partitioned__extract_doy
-            , subq_10.paid_at__day
-            , subq_10.paid_at__week
-            , subq_10.paid_at__month
-            , subq_10.paid_at__quarter
-            , subq_10.paid_at__year
-            , subq_10.paid_at__extract_year
-            , subq_10.paid_at__extract_quarter
-            , subq_10.paid_at__extract_month
-            , subq_10.paid_at__extract_day
-            , subq_10.paid_at__extract_dow
-            , subq_10.paid_at__extract_doy
-            , subq_10.booking__ds__day
-            , subq_10.booking__ds__week
-            , subq_10.booking__ds__month
-            , subq_10.booking__ds__quarter
-            , subq_10.booking__ds__year
-            , subq_10.booking__ds__extract_year
-            , subq_10.booking__ds__extract_quarter
-            , subq_10.booking__ds__extract_month
-            , subq_10.booking__ds__extract_day
-            , subq_10.booking__ds__extract_dow
-            , subq_10.booking__ds__extract_doy
-            , subq_10.booking__ds_partitioned__day
-            , subq_10.booking__ds_partitioned__week
-            , subq_10.booking__ds_partitioned__month
-            , subq_10.booking__ds_partitioned__quarter
-            , subq_10.booking__ds_partitioned__year
-            , subq_10.booking__ds_partitioned__extract_year
-            , subq_10.booking__ds_partitioned__extract_quarter
-            , subq_10.booking__ds_partitioned__extract_month
-            , subq_10.booking__ds_partitioned__extract_day
-            , subq_10.booking__ds_partitioned__extract_dow
-            , subq_10.booking__ds_partitioned__extract_doy
-            , subq_10.booking__paid_at__day
-            , subq_10.booking__paid_at__week
-            , subq_10.booking__paid_at__month
-            , subq_10.booking__paid_at__quarter
-            , subq_10.booking__paid_at__year
-            , subq_10.booking__paid_at__extract_year
-            , subq_10.booking__paid_at__extract_quarter
-            , subq_10.booking__paid_at__extract_month
-            , subq_10.booking__paid_at__extract_day
-            , subq_10.booking__paid_at__extract_dow
-            , subq_10.booking__paid_at__extract_doy
-            , subq_10.ds__day AS metric_time__day
-            , subq_10.ds__week AS metric_time__week
-            , subq_10.ds__month AS metric_time__month
-            , subq_10.ds__quarter AS metric_time__quarter
-            , subq_10.ds__year AS metric_time__year
-            , subq_10.ds__extract_year AS metric_time__extract_year
-            , subq_10.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_10.ds__extract_month AS metric_time__extract_month
-            , subq_10.ds__extract_day AS metric_time__extract_day
-            , subq_10.ds__extract_dow AS metric_time__extract_dow
-            , subq_10.ds__extract_doy AS metric_time__extract_doy
-            , subq_10.listing
-            , subq_10.guest
-            , subq_10.host
-            , subq_10.booking__listing
-            , subq_10.booking__guest
-            , subq_10.booking__host
-            , subq_10.is_instant
-            , subq_10.booking__is_instant
-            , subq_10.bookings
-            , subq_10.instant_bookings
-            , subq_10.booking_value
-            , subq_10.max_booking_value
-            , subq_10.min_booking_value
-            , subq_10.bookers
-            , subq_10.average_booking_value
-            , subq_10.referred_bookings
-            , subq_10.median_booking_value
-            , subq_10.booking_value_p99
-            , subq_10.discrete_booking_value_p99
-            , subq_10.approximate_continuous_booking_value_p99
-            , subq_10.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_10
-        ) subq_11
-      ) subq_12
-      GROUP BY
-        subq_12.metric_time__day
-    ) subq_13
-  ) subq_14
-  ON
-    subq_9.metric_time__day = subq_14.metric_time__day
-  GROUP BY
-    COALESCE(subq_9.metric_time__day, subq_14.metric_time__day)
-) subq_15
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index db345ac389..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_23.metric_time__day, subq_28.metric_time__day) AS metric_time__day
-    , MAX(subq_23.average_booking_value) AS average_booking_value
-    , MAX(subq_28.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_17
-      WHERE booking__is_instant
-    ) subq_19
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_23
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_28
-  ON
-    subq_23.metric_time__day = subq_28.metric_time__day
-  GROUP BY
-    COALESCE(subq_23.metric_time__day, subq_28.metric_time__day)
-) subq_29
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index a4d7c09a3c..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 44eac537d1..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_distinct_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index e1b07ee2ad..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE PRECISION) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE PRECISION) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(isodow FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(isodow FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 80c554f04a..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE PRECISION) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE PRECISION) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index f11c286f44..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS DOUBLE PRECISION) / CAST(NULLIF(subq_19.max_booking_value, 0) AS DOUBLE PRECISION) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        subq_11.metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        subq_16.metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day)
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 8fd9bd5080..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE PRECISION) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE PRECISION) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day)
-) subq_33
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index d04c175116..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE PRECISION) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE PRECISION) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , CASE WHEN EXTRACT(dow FROM accounts_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM accounts_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM accounts_source_src_28000.ds) END AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , CASE WHEN EXTRACT(dow FROM users_latest_src_28000.ds) = 0 THEN EXTRACT(dow FROM users_latest_src_28000.ds) + 7 ELSE EXTRACT(dow FROM users_latest_src_28000.ds) END AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 80c554f04a..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE PRECISION) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE PRECISION) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index 447784aa01..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS DOUBLE PRECISION) / CAST(NULLIF(subq_19.max_booking_value, 0) AS DOUBLE PRECISION) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        subq_11.metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        subq_16.metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day)
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 8fd9bd5080..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE PRECISION) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE PRECISION) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day)
-) subq_33
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index f3103e613f..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(dayofweekiso FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(dayofweekiso FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 44eac537d1..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index fac10af629..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS DOUBLE) / CAST(NULLIF(subq_19.max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        subq_11.metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        subq_16.metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day)
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 111a82caa8..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day)
-) subq_33
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
deleted file mode 100644
index 0dee0eb985..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,651 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  CAST(subq_28.west_coast_balance_first_day AS DOUBLE) / CAST(NULLIF(subq_28.east_coast_balance_first_dat, 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    MAX(subq_13.west_coast_balance_first_day) AS west_coast_balance_first_day
-    , MAX(subq_27.east_coast_balance_first_dat) AS east_coast_balance_first_dat
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.total_account_balance_first_day AS west_coast_balance_first_day
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_11.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_10.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_7.ds__day AS ds__day
-            , subq_7.user__home_state_latest AS user__home_state_latest
-            , subq_7.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_6.ds__day
-              , subq_6.user__home_state_latest
-              , subq_6.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_5.ds__day
-                , subq_5.user__home_state_latest
-                , subq_5.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_2.ds__day AS ds__day
-                  , subq_2.user AS user
-                  , subq_4.home_state_latest AS user__home_state_latest
-                  , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_1.ds__day
-                    , subq_1.user
-                    , subq_1.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_0.ds__day
-                      , subq_0.ds__week
-                      , subq_0.ds__month
-                      , subq_0.ds__quarter
-                      , subq_0.ds__year
-                      , subq_0.ds__extract_year
-                      , subq_0.ds__extract_quarter
-                      , subq_0.ds__extract_month
-                      , subq_0.ds__extract_day
-                      , subq_0.ds__extract_dow
-                      , subq_0.ds__extract_doy
-                      , subq_0.account__ds__day
-                      , subq_0.account__ds__week
-                      , subq_0.account__ds__month
-                      , subq_0.account__ds__quarter
-                      , subq_0.account__ds__year
-                      , subq_0.account__ds__extract_year
-                      , subq_0.account__ds__extract_quarter
-                      , subq_0.account__ds__extract_month
-                      , subq_0.account__ds__extract_day
-                      , subq_0.account__ds__extract_dow
-                      , subq_0.account__ds__extract_doy
-                      , subq_0.ds__day AS metric_time__day
-                      , subq_0.ds__week AS metric_time__week
-                      , subq_0.ds__month AS metric_time__month
-                      , subq_0.ds__quarter AS metric_time__quarter
-                      , subq_0.ds__year AS metric_time__year
-                      , subq_0.ds__extract_year AS metric_time__extract_year
-                      , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_0.ds__extract_month AS metric_time__extract_month
-                      , subq_0.ds__extract_day AS metric_time__extract_day
-                      , subq_0.ds__extract_dow AS metric_time__extract_dow
-                      , subq_0.ds__extract_doy AS metric_time__extract_doy
-                      , subq_0.user
-                      , subq_0.account__user
-                      , subq_0.account_type
-                      , subq_0.account__account_type
-                      , subq_0.account_balance
-                      , subq_0.total_account_balance_first_day
-                      , subq_0.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_0
-                  ) subq_1
-                ) subq_2
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_3.user
-                    , subq_3.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_3
-                ) subq_4
-                ON
-                  subq_2.user = subq_4.user
-              ) subq_5
-            ) subq_6
-            WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-          ) subq_7
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_8.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_6.ds__day
-                , subq_6.user__home_state_latest
-                , subq_6.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_5.ds__day
-                  , subq_5.user__home_state_latest
-                  , subq_5.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_2.ds__day AS ds__day
-                    , subq_2.user AS user
-                    , subq_4.home_state_latest AS user__home_state_latest
-                    , subq_2.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_1.ds__day
-                      , subq_1.user
-                      , subq_1.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_0.ds__day
-                        , subq_0.ds__week
-                        , subq_0.ds__month
-                        , subq_0.ds__quarter
-                        , subq_0.ds__year
-                        , subq_0.ds__extract_year
-                        , subq_0.ds__extract_quarter
-                        , subq_0.ds__extract_month
-                        , subq_0.ds__extract_day
-                        , subq_0.ds__extract_dow
-                        , subq_0.ds__extract_doy
-                        , subq_0.account__ds__day
-                        , subq_0.account__ds__week
-                        , subq_0.account__ds__month
-                        , subq_0.account__ds__quarter
-                        , subq_0.account__ds__year
-                        , subq_0.account__ds__extract_year
-                        , subq_0.account__ds__extract_quarter
-                        , subq_0.account__ds__extract_month
-                        , subq_0.account__ds__extract_day
-                        , subq_0.account__ds__extract_dow
-                        , subq_0.account__ds__extract_doy
-                        , subq_0.ds__day AS metric_time__day
-                        , subq_0.ds__week AS metric_time__week
-                        , subq_0.ds__month AS metric_time__month
-                        , subq_0.ds__quarter AS metric_time__quarter
-                        , subq_0.ds__year AS metric_time__year
-                        , subq_0.ds__extract_year AS metric_time__extract_year
-                        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_0.ds__extract_month AS metric_time__extract_month
-                        , subq_0.ds__extract_day AS metric_time__extract_day
-                        , subq_0.ds__extract_dow AS metric_time__extract_dow
-                        , subq_0.ds__extract_doy AS metric_time__extract_doy
-                        , subq_0.user
-                        , subq_0.account__user
-                        , subq_0.account_type
-                        , subq_0.account__account_type
-                        , subq_0.account_balance
-                        , subq_0.total_account_balance_first_day
-                        , subq_0.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_0
-                    ) subq_1
-                  ) subq_2
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_3.user
-                      , subq_3.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_3
-                  ) subq_4
-                  ON
-                    subq_2.user = subq_4.user
-                ) subq_5
-              ) subq_6
-              WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-            ) subq_8
-          ) subq_9
-          ON
-            subq_7.ds__day = subq_9.ds__day__complete
-        ) subq_10
-      ) subq_11
-    ) subq_12
-  ) subq_13
-  CROSS JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_26.total_account_balance_first_day AS east_coast_balance_first_dat
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        SUM(subq_25.total_account_balance_first_day) AS total_account_balance_first_day
-      FROM (
-        -- Pass Only Elements: ['total_account_balance_first_day',]
-        SELECT
-          subq_24.total_account_balance_first_day
-        FROM (
-          -- Join on MIN(ds) and [] grouping by None
-          SELECT
-            subq_21.ds__day AS ds__day
-            , subq_21.user__home_state_latest AS user__home_state_latest
-            , subq_21.total_account_balance_first_day AS total_account_balance_first_day
-          FROM (
-            -- Constrain Output with WHERE
-            SELECT
-              subq_20.ds__day
-              , subq_20.user__home_state_latest
-              , subq_20.total_account_balance_first_day
-            FROM (
-              -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-              SELECT
-                subq_19.ds__day
-                , subq_19.user__home_state_latest
-                , subq_19.total_account_balance_first_day
-              FROM (
-                -- Join Standard Outputs
-                SELECT
-                  subq_16.ds__day AS ds__day
-                  , subq_16.user AS user
-                  , subq_18.home_state_latest AS user__home_state_latest
-                  , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                FROM (
-                  -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                  SELECT
-                    subq_15.ds__day
-                    , subq_15.user
-                    , subq_15.total_account_balance_first_day
-                  FROM (
-                    -- Metric Time Dimension 'ds'
-                    SELECT
-                      subq_14.ds__day
-                      , subq_14.ds__week
-                      , subq_14.ds__month
-                      , subq_14.ds__quarter
-                      , subq_14.ds__year
-                      , subq_14.ds__extract_year
-                      , subq_14.ds__extract_quarter
-                      , subq_14.ds__extract_month
-                      , subq_14.ds__extract_day
-                      , subq_14.ds__extract_dow
-                      , subq_14.ds__extract_doy
-                      , subq_14.account__ds__day
-                      , subq_14.account__ds__week
-                      , subq_14.account__ds__month
-                      , subq_14.account__ds__quarter
-                      , subq_14.account__ds__year
-                      , subq_14.account__ds__extract_year
-                      , subq_14.account__ds__extract_quarter
-                      , subq_14.account__ds__extract_month
-                      , subq_14.account__ds__extract_day
-                      , subq_14.account__ds__extract_dow
-                      , subq_14.account__ds__extract_doy
-                      , subq_14.ds__day AS metric_time__day
-                      , subq_14.ds__week AS metric_time__week
-                      , subq_14.ds__month AS metric_time__month
-                      , subq_14.ds__quarter AS metric_time__quarter
-                      , subq_14.ds__year AS metric_time__year
-                      , subq_14.ds__extract_year AS metric_time__extract_year
-                      , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                      , subq_14.ds__extract_month AS metric_time__extract_month
-                      , subq_14.ds__extract_day AS metric_time__extract_day
-                      , subq_14.ds__extract_dow AS metric_time__extract_dow
-                      , subq_14.ds__extract_doy AS metric_time__extract_doy
-                      , subq_14.user
-                      , subq_14.account__user
-                      , subq_14.account_type
-                      , subq_14.account__account_type
-                      , subq_14.account_balance
-                      , subq_14.total_account_balance_first_day
-                      , subq_14.current_account_balance_by_user
-                    FROM (
-                      -- Read Elements From Semantic Model 'accounts_source'
-                      SELECT
-                        accounts_source_src_28000.account_balance
-                        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                        , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                        , accounts_source_src_28000.account_type
-                        , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                        , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                        , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                        , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                        , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                        , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                        , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                        , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                        , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                        , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                        , accounts_source_src_28000.account_type AS account__account_type
-                        , accounts_source_src_28000.user_id AS user
-                        , accounts_source_src_28000.user_id AS account__user
-                      FROM ***************************.fct_accounts accounts_source_src_28000
-                    ) subq_14
-                  ) subq_15
-                ) subq_16
-                LEFT OUTER JOIN (
-                  -- Pass Only Elements: ['home_state_latest', 'user']
-                  SELECT
-                    subq_17.user
-                    , subq_17.home_state_latest
-                  FROM (
-                    -- Read Elements From Semantic Model 'users_latest'
-                    SELECT
-                      DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                      , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest
-                      , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                      , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                      , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                      , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                      , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                      , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                      , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                      , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                      , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                      , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                      , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                      , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                      , users_latest_src_28000.user_id AS user
-                    FROM ***************************.dim_users_latest users_latest_src_28000
-                  ) subq_17
-                ) subq_18
-                ON
-                  subq_16.user = subq_18.user
-              ) subq_19
-            ) subq_20
-            WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-          ) subq_21
-          INNER JOIN (
-            -- Filter row on MIN(ds__day)
-            SELECT
-              MIN(subq_22.ds__day) AS ds__day__complete
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_20.ds__day
-                , subq_20.user__home_state_latest
-                , subq_20.total_account_balance_first_day
-              FROM (
-                -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-                SELECT
-                  subq_19.ds__day
-                  , subq_19.user__home_state_latest
-                  , subq_19.total_account_balance_first_day
-                FROM (
-                  -- Join Standard Outputs
-                  SELECT
-                    subq_16.ds__day AS ds__day
-                    , subq_16.user AS user
-                    , subq_18.home_state_latest AS user__home_state_latest
-                    , subq_16.total_account_balance_first_day AS total_account_balance_first_day
-                  FROM (
-                    -- Pass Only Elements: ['total_account_balance_first_day', 'ds__day', 'user']
-                    SELECT
-                      subq_15.ds__day
-                      , subq_15.user
-                      , subq_15.total_account_balance_first_day
-                    FROM (
-                      -- Metric Time Dimension 'ds'
-                      SELECT
-                        subq_14.ds__day
-                        , subq_14.ds__week
-                        , subq_14.ds__month
-                        , subq_14.ds__quarter
-                        , subq_14.ds__year
-                        , subq_14.ds__extract_year
-                        , subq_14.ds__extract_quarter
-                        , subq_14.ds__extract_month
-                        , subq_14.ds__extract_day
-                        , subq_14.ds__extract_dow
-                        , subq_14.ds__extract_doy
-                        , subq_14.account__ds__day
-                        , subq_14.account__ds__week
-                        , subq_14.account__ds__month
-                        , subq_14.account__ds__quarter
-                        , subq_14.account__ds__year
-                        , subq_14.account__ds__extract_year
-                        , subq_14.account__ds__extract_quarter
-                        , subq_14.account__ds__extract_month
-                        , subq_14.account__ds__extract_day
-                        , subq_14.account__ds__extract_dow
-                        , subq_14.account__ds__extract_doy
-                        , subq_14.ds__day AS metric_time__day
-                        , subq_14.ds__week AS metric_time__week
-                        , subq_14.ds__month AS metric_time__month
-                        , subq_14.ds__quarter AS metric_time__quarter
-                        , subq_14.ds__year AS metric_time__year
-                        , subq_14.ds__extract_year AS metric_time__extract_year
-                        , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-                        , subq_14.ds__extract_month AS metric_time__extract_month
-                        , subq_14.ds__extract_day AS metric_time__extract_day
-                        , subq_14.ds__extract_dow AS metric_time__extract_dow
-                        , subq_14.ds__extract_doy AS metric_time__extract_doy
-                        , subq_14.user
-                        , subq_14.account__user
-                        , subq_14.account_type
-                        , subq_14.account__account_type
-                        , subq_14.account_balance
-                        , subq_14.total_account_balance_first_day
-                        , subq_14.current_account_balance_by_user
-                      FROM (
-                        -- Read Elements From Semantic Model 'accounts_source'
-                        SELECT
-                          accounts_source_src_28000.account_balance
-                          , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-                          , accounts_source_src_28000.account_balance AS current_account_balance_by_user
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS ds__extract_day
-                          , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS ds__extract_doy
-                          , accounts_source_src_28000.account_type
-                          , DATE_TRUNC('day', accounts_source_src_28000.ds) AS account__ds__day
-                          , DATE_TRUNC('week', accounts_source_src_28000.ds) AS account__ds__week
-                          , DATE_TRUNC('month', accounts_source_src_28000.ds) AS account__ds__month
-                          , DATE_TRUNC('quarter', accounts_source_src_28000.ds) AS account__ds__quarter
-                          , DATE_TRUNC('year', accounts_source_src_28000.ds) AS account__ds__year
-                          , EXTRACT(year FROM accounts_source_src_28000.ds) AS account__ds__extract_year
-                          , EXTRACT(quarter FROM accounts_source_src_28000.ds) AS account__ds__extract_quarter
-                          , EXTRACT(month FROM accounts_source_src_28000.ds) AS account__ds__extract_month
-                          , EXTRACT(day FROM accounts_source_src_28000.ds) AS account__ds__extract_day
-                          , EXTRACT(DAY_OF_WEEK FROM accounts_source_src_28000.ds) AS account__ds__extract_dow
-                          , EXTRACT(doy FROM accounts_source_src_28000.ds) AS account__ds__extract_doy
-                          , accounts_source_src_28000.account_type AS account__account_type
-                          , accounts_source_src_28000.user_id AS user
-                          , accounts_source_src_28000.user_id AS account__user
-                        FROM ***************************.fct_accounts accounts_source_src_28000
-                      ) subq_14
-                    ) subq_15
-                  ) subq_16
-                  LEFT OUTER JOIN (
-                    -- Pass Only Elements: ['home_state_latest', 'user']
-                    SELECT
-                      subq_17.user
-                      , subq_17.home_state_latest
-                    FROM (
-                      -- Read Elements From Semantic Model 'users_latest'
-                      SELECT
-                        DATE_TRUNC('day', users_latest_src_28000.ds) AS ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS ds_latest__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest
-                        , DATE_TRUNC('day', users_latest_src_28000.ds) AS user__ds_latest__day
-                        , DATE_TRUNC('week', users_latest_src_28000.ds) AS user__ds_latest__week
-                        , DATE_TRUNC('month', users_latest_src_28000.ds) AS user__ds_latest__month
-                        , DATE_TRUNC('quarter', users_latest_src_28000.ds) AS user__ds_latest__quarter
-                        , DATE_TRUNC('year', users_latest_src_28000.ds) AS user__ds_latest__year
-                        , EXTRACT(year FROM users_latest_src_28000.ds) AS user__ds_latest__extract_year
-                        , EXTRACT(quarter FROM users_latest_src_28000.ds) AS user__ds_latest__extract_quarter
-                        , EXTRACT(month FROM users_latest_src_28000.ds) AS user__ds_latest__extract_month
-                        , EXTRACT(day FROM users_latest_src_28000.ds) AS user__ds_latest__extract_day
-                        , EXTRACT(DAY_OF_WEEK FROM users_latest_src_28000.ds) AS user__ds_latest__extract_dow
-                        , EXTRACT(doy FROM users_latest_src_28000.ds) AS user__ds_latest__extract_doy
-                        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-                        , users_latest_src_28000.user_id AS user
-                      FROM ***************************.dim_users_latest users_latest_src_28000
-                    ) subq_17
-                  ) subq_18
-                  ON
-                    subq_16.user = subq_18.user
-                ) subq_19
-              ) subq_20
-              WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-            ) subq_22
-          ) subq_23
-          ON
-            subq_21.ds__day = subq_23.ds__day__complete
-        ) subq_24
-      ) subq_25
-    ) subq_26
-  ) subq_27
-) subq_28
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 44eac537d1..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_joined_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,102 +0,0 @@
--- Combine Aggregated Outputs
--- Compute Metrics via Expressions
-SELECT
-  CAST(MAX(subq_42.west_coast_balance_first_day) AS DOUBLE) / CAST(NULLIF(MAX(subq_56.east_coast_balance_first_dat), 0) AS DOUBLE) AS regional_starting_balance_ratios
-FROM (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_36.total_account_balance_first_day) AS west_coast_balance_first_day
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_36
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_35
-    WHERE user__home_state_latest IN ('CA', 'HI', 'WA')
-  ) subq_38
-  ON
-    subq_36.ds__day = subq_38.ds__day__complete
-) subq_42
-CROSS JOIN (
-  -- Join on MIN(ds) and [] grouping by None
-  -- Pass Only Elements: ['total_account_balance_first_day',]
-  -- Aggregate Measures
-  -- Compute Metrics via Expressions
-  SELECT
-    SUM(subq_50.total_account_balance_first_day) AS east_coast_balance_first_dat
-  FROM (
-    -- Constrain Output with WHERE
-    SELECT
-      ds__day
-      , total_account_balance_first_day
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-        , accounts_source_src_28000.account_balance AS total_account_balance_first_day
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_50
-  INNER JOIN (
-    -- Constrain Output with WHERE
-    -- Filter row on MIN(ds__day)
-    SELECT
-      MIN(ds__day) AS ds__day__complete
-    FROM (
-      -- Join Standard Outputs
-      -- Pass Only Elements: ['total_account_balance_first_day', 'user__home_state_latest', 'ds__day']
-      SELECT
-        DATE_TRUNC('day', accounts_source_src_28000.ds) AS ds__day
-        , users_latest_src_28000.home_state_latest AS user__home_state_latest
-      FROM ***************************.fct_accounts accounts_source_src_28000
-      LEFT OUTER JOIN
-        ***************************.dim_users_latest users_latest_src_28000
-      ON
-        accounts_source_src_28000.user_id = users_latest_src_28000.user_id
-    ) subq_49
-    WHERE user__home_state_latest IN ('MD', 'NY', 'TX')
-  ) subq_52
-  ON
-    subq_50.ds__day = subq_52.ds__day__complete
-) subq_56
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
deleted file mode 100644
index ce5e6dddef..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ /dev/null
@@ -1,563 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  subq_19.metric_time__day
-  , CAST(subq_19.average_booking_value AS DOUBLE) / CAST(NULLIF(subq_19.max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day) AS metric_time__day
-    , MAX(subq_13.average_booking_value) AS average_booking_value
-    , MAX(subq_18.max_booking_value) AS max_booking_value
-  FROM (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_12.metric_time__day
-      , subq_12.average_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_11.metric_time__day
-        , AVG(subq_11.average_booking_value) AS average_booking_value
-      FROM (
-        -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-        SELECT
-          subq_10.metric_time__day
-          , subq_10.average_booking_value
-        FROM (
-          -- Constrain Output with WHERE
-          SELECT
-            subq_9.metric_time__day
-            , subq_9.booking__is_instant
-            , subq_9.average_booking_value
-          FROM (
-            -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-            SELECT
-              subq_8.metric_time__day
-              , subq_8.booking__is_instant
-              , subq_8.average_booking_value
-            FROM (
-              -- Constrain Output with WHERE
-              SELECT
-                subq_7.ds__day
-                , subq_7.ds__week
-                , subq_7.ds__month
-                , subq_7.ds__quarter
-                , subq_7.ds__year
-                , subq_7.ds__extract_year
-                , subq_7.ds__extract_quarter
-                , subq_7.ds__extract_month
-                , subq_7.ds__extract_day
-                , subq_7.ds__extract_dow
-                , subq_7.ds__extract_doy
-                , subq_7.ds_partitioned__day
-                , subq_7.ds_partitioned__week
-                , subq_7.ds_partitioned__month
-                , subq_7.ds_partitioned__quarter
-                , subq_7.ds_partitioned__year
-                , subq_7.ds_partitioned__extract_year
-                , subq_7.ds_partitioned__extract_quarter
-                , subq_7.ds_partitioned__extract_month
-                , subq_7.ds_partitioned__extract_day
-                , subq_7.ds_partitioned__extract_dow
-                , subq_7.ds_partitioned__extract_doy
-                , subq_7.paid_at__day
-                , subq_7.paid_at__week
-                , subq_7.paid_at__month
-                , subq_7.paid_at__quarter
-                , subq_7.paid_at__year
-                , subq_7.paid_at__extract_year
-                , subq_7.paid_at__extract_quarter
-                , subq_7.paid_at__extract_month
-                , subq_7.paid_at__extract_day
-                , subq_7.paid_at__extract_dow
-                , subq_7.paid_at__extract_doy
-                , subq_7.booking__ds__day
-                , subq_7.booking__ds__week
-                , subq_7.booking__ds__month
-                , subq_7.booking__ds__quarter
-                , subq_7.booking__ds__year
-                , subq_7.booking__ds__extract_year
-                , subq_7.booking__ds__extract_quarter
-                , subq_7.booking__ds__extract_month
-                , subq_7.booking__ds__extract_day
-                , subq_7.booking__ds__extract_dow
-                , subq_7.booking__ds__extract_doy
-                , subq_7.booking__ds_partitioned__day
-                , subq_7.booking__ds_partitioned__week
-                , subq_7.booking__ds_partitioned__month
-                , subq_7.booking__ds_partitioned__quarter
-                , subq_7.booking__ds_partitioned__year
-                , subq_7.booking__ds_partitioned__extract_year
-                , subq_7.booking__ds_partitioned__extract_quarter
-                , subq_7.booking__ds_partitioned__extract_month
-                , subq_7.booking__ds_partitioned__extract_day
-                , subq_7.booking__ds_partitioned__extract_dow
-                , subq_7.booking__ds_partitioned__extract_doy
-                , subq_7.booking__paid_at__day
-                , subq_7.booking__paid_at__week
-                , subq_7.booking__paid_at__month
-                , subq_7.booking__paid_at__quarter
-                , subq_7.booking__paid_at__year
-                , subq_7.booking__paid_at__extract_year
-                , subq_7.booking__paid_at__extract_quarter
-                , subq_7.booking__paid_at__extract_month
-                , subq_7.booking__paid_at__extract_day
-                , subq_7.booking__paid_at__extract_dow
-                , subq_7.booking__paid_at__extract_doy
-                , subq_7.metric_time__day
-                , subq_7.metric_time__week
-                , subq_7.metric_time__month
-                , subq_7.metric_time__quarter
-                , subq_7.metric_time__year
-                , subq_7.metric_time__extract_year
-                , subq_7.metric_time__extract_quarter
-                , subq_7.metric_time__extract_month
-                , subq_7.metric_time__extract_day
-                , subq_7.metric_time__extract_dow
-                , subq_7.metric_time__extract_doy
-                , subq_7.listing
-                , subq_7.guest
-                , subq_7.host
-                , subq_7.booking__listing
-                , subq_7.booking__guest
-                , subq_7.booking__host
-                , subq_7.is_instant
-                , subq_7.booking__is_instant
-                , subq_7.bookings
-                , subq_7.instant_bookings
-                , subq_7.booking_value
-                , subq_7.max_booking_value
-                , subq_7.min_booking_value
-                , subq_7.bookers
-                , subq_7.average_booking_value
-                , subq_7.referred_bookings
-                , subq_7.median_booking_value
-                , subq_7.booking_value_p99
-                , subq_7.discrete_booking_value_p99
-                , subq_7.approximate_continuous_booking_value_p99
-                , subq_7.approximate_discrete_booking_value_p99
-              FROM (
-                -- Metric Time Dimension 'ds'
-                SELECT
-                  subq_6.ds__day
-                  , subq_6.ds__week
-                  , subq_6.ds__month
-                  , subq_6.ds__quarter
-                  , subq_6.ds__year
-                  , subq_6.ds__extract_year
-                  , subq_6.ds__extract_quarter
-                  , subq_6.ds__extract_month
-                  , subq_6.ds__extract_day
-                  , subq_6.ds__extract_dow
-                  , subq_6.ds__extract_doy
-                  , subq_6.ds_partitioned__day
-                  , subq_6.ds_partitioned__week
-                  , subq_6.ds_partitioned__month
-                  , subq_6.ds_partitioned__quarter
-                  , subq_6.ds_partitioned__year
-                  , subq_6.ds_partitioned__extract_year
-                  , subq_6.ds_partitioned__extract_quarter
-                  , subq_6.ds_partitioned__extract_month
-                  , subq_6.ds_partitioned__extract_day
-                  , subq_6.ds_partitioned__extract_dow
-                  , subq_6.ds_partitioned__extract_doy
-                  , subq_6.paid_at__day
-                  , subq_6.paid_at__week
-                  , subq_6.paid_at__month
-                  , subq_6.paid_at__quarter
-                  , subq_6.paid_at__year
-                  , subq_6.paid_at__extract_year
-                  , subq_6.paid_at__extract_quarter
-                  , subq_6.paid_at__extract_month
-                  , subq_6.paid_at__extract_day
-                  , subq_6.paid_at__extract_dow
-                  , subq_6.paid_at__extract_doy
-                  , subq_6.booking__ds__day
-                  , subq_6.booking__ds__week
-                  , subq_6.booking__ds__month
-                  , subq_6.booking__ds__quarter
-                  , subq_6.booking__ds__year
-                  , subq_6.booking__ds__extract_year
-                  , subq_6.booking__ds__extract_quarter
-                  , subq_6.booking__ds__extract_month
-                  , subq_6.booking__ds__extract_day
-                  , subq_6.booking__ds__extract_dow
-                  , subq_6.booking__ds__extract_doy
-                  , subq_6.booking__ds_partitioned__day
-                  , subq_6.booking__ds_partitioned__week
-                  , subq_6.booking__ds_partitioned__month
-                  , subq_6.booking__ds_partitioned__quarter
-                  , subq_6.booking__ds_partitioned__year
-                  , subq_6.booking__ds_partitioned__extract_year
-                  , subq_6.booking__ds_partitioned__extract_quarter
-                  , subq_6.booking__ds_partitioned__extract_month
-                  , subq_6.booking__ds_partitioned__extract_day
-                  , subq_6.booking__ds_partitioned__extract_dow
-                  , subq_6.booking__ds_partitioned__extract_doy
-                  , subq_6.booking__paid_at__day
-                  , subq_6.booking__paid_at__week
-                  , subq_6.booking__paid_at__month
-                  , subq_6.booking__paid_at__quarter
-                  , subq_6.booking__paid_at__year
-                  , subq_6.booking__paid_at__extract_year
-                  , subq_6.booking__paid_at__extract_quarter
-                  , subq_6.booking__paid_at__extract_month
-                  , subq_6.booking__paid_at__extract_day
-                  , subq_6.booking__paid_at__extract_dow
-                  , subq_6.booking__paid_at__extract_doy
-                  , subq_6.ds__day AS metric_time__day
-                  , subq_6.ds__week AS metric_time__week
-                  , subq_6.ds__month AS metric_time__month
-                  , subq_6.ds__quarter AS metric_time__quarter
-                  , subq_6.ds__year AS metric_time__year
-                  , subq_6.ds__extract_year AS metric_time__extract_year
-                  , subq_6.ds__extract_quarter AS metric_time__extract_quarter
-                  , subq_6.ds__extract_month AS metric_time__extract_month
-                  , subq_6.ds__extract_day AS metric_time__extract_day
-                  , subq_6.ds__extract_dow AS metric_time__extract_dow
-                  , subq_6.ds__extract_doy AS metric_time__extract_doy
-                  , subq_6.listing
-                  , subq_6.guest
-                  , subq_6.host
-                  , subq_6.booking__listing
-                  , subq_6.booking__guest
-                  , subq_6.booking__host
-                  , subq_6.is_instant
-                  , subq_6.booking__is_instant
-                  , subq_6.bookings
-                  , subq_6.instant_bookings
-                  , subq_6.booking_value
-                  , subq_6.max_booking_value
-                  , subq_6.min_booking_value
-                  , subq_6.bookers
-                  , subq_6.average_booking_value
-                  , subq_6.referred_bookings
-                  , subq_6.median_booking_value
-                  , subq_6.booking_value_p99
-                  , subq_6.discrete_booking_value_p99
-                  , subq_6.approximate_continuous_booking_value_p99
-                  , subq_6.approximate_discrete_booking_value_p99
-                FROM (
-                  -- Read Elements From Semantic Model 'bookings_source'
-                  SELECT
-                    1 AS bookings
-                    , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-                    , bookings_source_src_28000.booking_value
-                    , bookings_source_src_28000.booking_value AS max_booking_value
-                    , bookings_source_src_28000.booking_value AS min_booking_value
-                    , bookings_source_src_28000.guest_id AS bookers
-                    , bookings_source_src_28000.booking_value AS average_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_payments
-                    , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-                    , bookings_source_src_28000.booking_value AS median_booking_value
-                    , bookings_source_src_28000.booking_value AS booking_value_p99
-                    , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-                    , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-                    , bookings_source_src_28000.is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-                    , bookings_source_src_28000.is_instant AS booking__is_instant
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-                    , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-                    , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-                    , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-                    , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-                    , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-                    , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-                    , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-                    , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-                    , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-                    , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-                    , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-                    , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-                    , bookings_source_src_28000.listing_id AS listing
-                    , bookings_source_src_28000.guest_id AS guest
-                    , bookings_source_src_28000.host_id AS host
-                    , bookings_source_src_28000.listing_id AS booking__listing
-                    , bookings_source_src_28000.guest_id AS booking__guest
-                    , bookings_source_src_28000.host_id AS booking__host
-                  FROM ***************************.fct_bookings bookings_source_src_28000
-                ) subq_6
-              ) subq_7
-              WHERE booking__is_instant
-            ) subq_8
-          ) subq_9
-          WHERE booking__is_instant
-        ) subq_10
-      ) subq_11
-      GROUP BY
-        subq_11.metric_time__day
-    ) subq_12
-  ) subq_13
-  FULL OUTER JOIN (
-    -- Compute Metrics via Expressions
-    SELECT
-      subq_17.metric_time__day
-      , subq_17.max_booking_value
-    FROM (
-      -- Aggregate Measures
-      SELECT
-        subq_16.metric_time__day
-        , MAX(subq_16.max_booking_value) AS max_booking_value
-      FROM (
-        -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-        SELECT
-          subq_15.metric_time__day
-          , subq_15.max_booking_value
-        FROM (
-          -- Metric Time Dimension 'ds'
-          SELECT
-            subq_14.ds__day
-            , subq_14.ds__week
-            , subq_14.ds__month
-            , subq_14.ds__quarter
-            , subq_14.ds__year
-            , subq_14.ds__extract_year
-            , subq_14.ds__extract_quarter
-            , subq_14.ds__extract_month
-            , subq_14.ds__extract_day
-            , subq_14.ds__extract_dow
-            , subq_14.ds__extract_doy
-            , subq_14.ds_partitioned__day
-            , subq_14.ds_partitioned__week
-            , subq_14.ds_partitioned__month
-            , subq_14.ds_partitioned__quarter
-            , subq_14.ds_partitioned__year
-            , subq_14.ds_partitioned__extract_year
-            , subq_14.ds_partitioned__extract_quarter
-            , subq_14.ds_partitioned__extract_month
-            , subq_14.ds_partitioned__extract_day
-            , subq_14.ds_partitioned__extract_dow
-            , subq_14.ds_partitioned__extract_doy
-            , subq_14.paid_at__day
-            , subq_14.paid_at__week
-            , subq_14.paid_at__month
-            , subq_14.paid_at__quarter
-            , subq_14.paid_at__year
-            , subq_14.paid_at__extract_year
-            , subq_14.paid_at__extract_quarter
-            , subq_14.paid_at__extract_month
-            , subq_14.paid_at__extract_day
-            , subq_14.paid_at__extract_dow
-            , subq_14.paid_at__extract_doy
-            , subq_14.booking__ds__day
-            , subq_14.booking__ds__week
-            , subq_14.booking__ds__month
-            , subq_14.booking__ds__quarter
-            , subq_14.booking__ds__year
-            , subq_14.booking__ds__extract_year
-            , subq_14.booking__ds__extract_quarter
-            , subq_14.booking__ds__extract_month
-            , subq_14.booking__ds__extract_day
-            , subq_14.booking__ds__extract_dow
-            , subq_14.booking__ds__extract_doy
-            , subq_14.booking__ds_partitioned__day
-            , subq_14.booking__ds_partitioned__week
-            , subq_14.booking__ds_partitioned__month
-            , subq_14.booking__ds_partitioned__quarter
-            , subq_14.booking__ds_partitioned__year
-            , subq_14.booking__ds_partitioned__extract_year
-            , subq_14.booking__ds_partitioned__extract_quarter
-            , subq_14.booking__ds_partitioned__extract_month
-            , subq_14.booking__ds_partitioned__extract_day
-            , subq_14.booking__ds_partitioned__extract_dow
-            , subq_14.booking__ds_partitioned__extract_doy
-            , subq_14.booking__paid_at__day
-            , subq_14.booking__paid_at__week
-            , subq_14.booking__paid_at__month
-            , subq_14.booking__paid_at__quarter
-            , subq_14.booking__paid_at__year
-            , subq_14.booking__paid_at__extract_year
-            , subq_14.booking__paid_at__extract_quarter
-            , subq_14.booking__paid_at__extract_month
-            , subq_14.booking__paid_at__extract_day
-            , subq_14.booking__paid_at__extract_dow
-            , subq_14.booking__paid_at__extract_doy
-            , subq_14.ds__day AS metric_time__day
-            , subq_14.ds__week AS metric_time__week
-            , subq_14.ds__month AS metric_time__month
-            , subq_14.ds__quarter AS metric_time__quarter
-            , subq_14.ds__year AS metric_time__year
-            , subq_14.ds__extract_year AS metric_time__extract_year
-            , subq_14.ds__extract_quarter AS metric_time__extract_quarter
-            , subq_14.ds__extract_month AS metric_time__extract_month
-            , subq_14.ds__extract_day AS metric_time__extract_day
-            , subq_14.ds__extract_dow AS metric_time__extract_dow
-            , subq_14.ds__extract_doy AS metric_time__extract_doy
-            , subq_14.listing
-            , subq_14.guest
-            , subq_14.host
-            , subq_14.booking__listing
-            , subq_14.booking__guest
-            , subq_14.booking__host
-            , subq_14.is_instant
-            , subq_14.booking__is_instant
-            , subq_14.bookings
-            , subq_14.instant_bookings
-            , subq_14.booking_value
-            , subq_14.max_booking_value
-            , subq_14.min_booking_value
-            , subq_14.bookers
-            , subq_14.average_booking_value
-            , subq_14.referred_bookings
-            , subq_14.median_booking_value
-            , subq_14.booking_value_p99
-            , subq_14.discrete_booking_value_p99
-            , subq_14.approximate_continuous_booking_value_p99
-            , subq_14.approximate_discrete_booking_value_p99
-          FROM (
-            -- Read Elements From Semantic Model 'bookings_source'
-            SELECT
-              1 AS bookings
-              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-              , bookings_source_src_28000.booking_value
-              , bookings_source_src_28000.booking_value AS max_booking_value
-              , bookings_source_src_28000.booking_value AS min_booking_value
-              , bookings_source_src_28000.guest_id AS bookers
-              , bookings_source_src_28000.booking_value AS average_booking_value
-              , bookings_source_src_28000.booking_value AS booking_payments
-              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-              , bookings_source_src_28000.booking_value AS median_booking_value
-              , bookings_source_src_28000.booking_value AS booking_value_p99
-              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-              , bookings_source_src_28000.is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-              , bookings_source_src_28000.is_instant AS booking__is_instant
-              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-              , bookings_source_src_28000.listing_id AS listing
-              , bookings_source_src_28000.guest_id AS guest
-              , bookings_source_src_28000.host_id AS host
-              , bookings_source_src_28000.listing_id AS booking__listing
-              , bookings_source_src_28000.guest_id AS booking__guest
-              , bookings_source_src_28000.host_id AS booking__host
-            FROM ***************************.fct_bookings bookings_source_src_28000
-          ) subq_14
-        ) subq_15
-      ) subq_16
-      GROUP BY
-        subq_16.metric_time__day
-    ) subq_17
-  ) subq_18
-  ON
-    subq_13.metric_time__day = subq_18.metric_time__day
-  GROUP BY
-    COALESCE(subq_13.metric_time__day, subq_18.metric_time__day)
-) subq_19
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
deleted file mode 100644
index 111a82caa8..0000000000
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  metric_time__day
-  , CAST(average_booking_value AS DOUBLE) / CAST(NULLIF(max_booking_value, 0) AS DOUBLE) AS instant_booking_fraction_of_max_value
-FROM (
-  -- Combine Aggregated Outputs
-  SELECT
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day) AS metric_time__day
-    , MAX(subq_27.average_booking_value) AS average_booking_value
-    , MAX(subq_32.max_booking_value) AS max_booking_value
-  FROM (
-    -- Constrain Output with WHERE
-    -- Pass Only Elements: ['average_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      metric_time__day
-      , AVG(average_booking_value) AS average_booking_value
-    FROM (
-      -- Constrain Output with WHERE
-      -- Pass Only Elements: ['average_booking_value', 'booking__is_instant', 'metric_time__day']
-      SELECT
-        metric_time__day
-        , booking__is_instant
-        , average_booking_value
-      FROM (
-        -- Read Elements From Semantic Model 'bookings_source'
-        -- Metric Time Dimension 'ds'
-        SELECT
-          DATE_TRUNC('day', ds) AS metric_time__day
-          , is_instant AS booking__is_instant
-          , booking_value AS average_booking_value
-        FROM ***************************.fct_bookings bookings_source_src_28000
-      ) subq_21
-      WHERE booking__is_instant
-    ) subq_23
-    WHERE booking__is_instant
-    GROUP BY
-      metric_time__day
-  ) subq_27
-  FULL OUTER JOIN (
-    -- Read Elements From Semantic Model 'bookings_source'
-    -- Metric Time Dimension 'ds'
-    -- Pass Only Elements: ['max_booking_value', 'metric_time__day']
-    -- Aggregate Measures
-    -- Compute Metrics via Expressions
-    SELECT
-      DATE_TRUNC('day', ds) AS metric_time__day
-      , MAX(booking_value) AS max_booking_value
-    FROM ***************************.fct_bookings bookings_source_src_28000
-    GROUP BY
-      DATE_TRUNC('day', ds)
-  ) subq_32
-  ON
-    subq_27.metric_time__day = subq_32.metric_time__day
-  GROUP BY
-    COALESCE(subq_27.metric_time__day, subq_32.metric_time__day)
-) subq_33
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_common_semantic_model__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_common_semantic_model__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_common_semantic_model__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_common_semantic_model__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_distinct_values__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_distinct_values__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_distinct_values__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_distinct_values__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_join_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_join_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_limit_rows__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_limit_rows__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_limit_rows__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_limit_rows__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_categorical__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_categorical__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time_quarter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time_quarter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multihop_node__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multihop_node__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multihop_node__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multihop_node__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_partitioned_join__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_partitioned_join__plan0.sql
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_partitioned_join__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_partitioned_join__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_render_cte.py/SqlQueryPlan/test_render_cte__plan_0.sql b/tests_metricflow/snapshots/test_render_cte.py/SqlPlan/test_render_cte__plan_0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_render_cte.py/SqlQueryPlan/test_render_cte__plan_0.sql
rename to tests_metricflow/snapshots/test_render_cte.py/SqlPlan/test_render_cte__plan_0.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_colliding_alias__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_colliding_alias__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_colliding_alias__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_colliding_alias__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_colliding_alias__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_colliding_alias__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_colliding_alias__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_colliding_alias__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_all_join_sources__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_all_join_sources__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_all_join_sources__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_all_join_sources__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_all_join_sources__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_all_join_sources__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_all_join_sources__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_all_join_sources__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_join__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_join__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_join__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_join__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_join__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_join__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_join__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_join__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_left_node_statement__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_left_node_statement__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_left_node_statement__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_left_node_statement__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_left_node_statement__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_left_node_statement__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_left_node_statement__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_left_node_statement__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_statement__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_statement__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_statement__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_statement__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_statement__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_statement__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_reducing_join_statement__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_reducing_join_statement__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_rewriting_distinct_select_node_is_not_reduced__after_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_rewriting_distinct_select_node_is_not_reduced__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_rewriting_distinct_select_node_is_not_reduced__after_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_rewriting_distinct_select_node_is_not_reduced__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_rewriting_distinct_select_node_is_not_reduced__before_reducing.sql b/tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_rewriting_distinct_select_node_is_not_reduced__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlQueryPlan/test_rewriting_distinct_select_node_is_not_reduced__before_reducing.sql
rename to tests_metricflow/snapshots/test_rewriting_sub_query_reducer.py/SqlPlan/test_rewriting_distinct_select_node_is_not_reduced__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/BigQuery/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Databricks/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/DuckDB/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Postgres/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Redshift/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Snowflake/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan1.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan1.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan2.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan2.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan3.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan3.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan4.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan4.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan5.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_component_rendering__plan5.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_create_table_as__create_table_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_create_table_as__create_table_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_create_table_as__create_view_as.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_create_table_as__create_view_as.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_limit__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_limit__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_order_by__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_order_by__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_where__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql
rename to tests_metricflow/snapshots/test_sql_plan_render.py/SqlPlan/Trino/test_render_where__plan0.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_distinct_select_node_is_not_reduced__after_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_distinct_select_node_is_not_reduced__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_distinct_select_node_is_not_reduced__after_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_distinct_select_node_is_not_reduced__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_distinct_select_node_is_not_reduced__before_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_distinct_select_node_is_not_reduced__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_distinct_select_node_is_not_reduced__before_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_distinct_select_node_is_not_reduced__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__after_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__after_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__before_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_reduce_sub_query__before_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_reduce_sub_query__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_rewrite_order_by_with_a_join_in_parent__after_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_rewrite_order_by_with_a_join_in_parent__after_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_rewrite_order_by_with_a_join_in_parent__after_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_rewrite_order_by_with_a_join_in_parent__after_reducing.sql
diff --git a/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_rewrite_order_by_with_a_join_in_parent__before_reducing.sql b/tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_rewrite_order_by_with_a_join_in_parent__before_reducing.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_sub_query_reducer.py/SqlQueryPlan/test_rewrite_order_by_with_a_join_in_parent__before_reducing.sql
rename to tests_metricflow/snapshots/test_sub_query_reducer.py/SqlPlan/test_rewrite_order_by_with_a_join_in_parent__before_reducing.sql
diff --git a/tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlQueryPlan/test_table_alias_simplification__after_alias_simplification.sql b/tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlPlan/test_table_alias_simplification__after_alias_simplification.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlQueryPlan/test_table_alias_simplification__after_alias_simplification.sql
rename to tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlPlan/test_table_alias_simplification__after_alias_simplification.sql
diff --git a/tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlQueryPlan/test_table_alias_simplification__before_alias_simplification.sql b/tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlPlan/test_table_alias_simplification__before_alias_simplification.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlQueryPlan/test_table_alias_simplification__before_alias_simplification.sql
rename to tests_metricflow/snapshots/test_table_alias_simplifier.py/SqlPlan/test_table_alias_simplification__before_alias_simplification.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
similarity index 100%
rename from tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
rename to tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index b34ef3be92..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, day) AS booking__ds__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, isoweek) AS booking__ds__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, month) AS booking__ds__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, quarter) AS booking__ds__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds, year) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds) - 1) AS booking__ds__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, day) AS booking__ds_partitioned__day
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, isoweek) AS booking__ds_partitioned__week
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, month) AS booking__ds_partitioned__month
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.ds_partitioned) - 1) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, day) AS booking__paid_at__day
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, isoweek) AS booking__paid_at__week
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, month) AS booking__paid_at__month
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, quarter) AS booking__paid_at__quarter
-            , DATETIME_TRUNC(bookings_source_src_28000.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , IF(EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) = 1, 7, EXTRACT(dayofweek FROM bookings_source_src_28000.paid_at) - 1) AS booking__paid_at__extract_dow
-            , EXTRACT(dayofyear FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f7c49d0fd2..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATETIME_TRUNC(ds, day) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index 629d3ebc69..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK_ISO FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f4298198ec..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index ae43a32c06..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f4298198ec..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index ae43a32c06..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f4298198ec..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index 18d24a1dcb..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds) END AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.ds_partitioned) END AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , CASE WHEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) = 0 THEN EXTRACT(dow FROM bookings_source_src_28000.paid_at) + 7 ELSE EXTRACT(dow FROM bookings_source_src_28000.paid_at) END AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f4298198ec..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index 57eeeab2ca..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(dayofweekiso FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN '2020-01-03' AND '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index f4298198ec..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN '2020-01-03' AND '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0.sql
deleted file mode 100644
index ec7a55c001..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0.sql
+++ /dev/null
@@ -1,311 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(subq_4.bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Aggregate Measures
-  SELECT
-    SUM(subq_3.bookings) AS bookings
-  FROM (
-    -- Pass Only Elements: ['bookings',]
-    SELECT
-      subq_2.bookings
-    FROM (
-      -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-      SELECT
-        subq_1.ds__day
-        , subq_1.ds__week
-        , subq_1.ds__month
-        , subq_1.ds__quarter
-        , subq_1.ds__year
-        , subq_1.ds__extract_year
-        , subq_1.ds__extract_quarter
-        , subq_1.ds__extract_month
-        , subq_1.ds__extract_day
-        , subq_1.ds__extract_dow
-        , subq_1.ds__extract_doy
-        , subq_1.ds_partitioned__day
-        , subq_1.ds_partitioned__week
-        , subq_1.ds_partitioned__month
-        , subq_1.ds_partitioned__quarter
-        , subq_1.ds_partitioned__year
-        , subq_1.ds_partitioned__extract_year
-        , subq_1.ds_partitioned__extract_quarter
-        , subq_1.ds_partitioned__extract_month
-        , subq_1.ds_partitioned__extract_day
-        , subq_1.ds_partitioned__extract_dow
-        , subq_1.ds_partitioned__extract_doy
-        , subq_1.paid_at__day
-        , subq_1.paid_at__week
-        , subq_1.paid_at__month
-        , subq_1.paid_at__quarter
-        , subq_1.paid_at__year
-        , subq_1.paid_at__extract_year
-        , subq_1.paid_at__extract_quarter
-        , subq_1.paid_at__extract_month
-        , subq_1.paid_at__extract_day
-        , subq_1.paid_at__extract_dow
-        , subq_1.paid_at__extract_doy
-        , subq_1.booking__ds__day
-        , subq_1.booking__ds__week
-        , subq_1.booking__ds__month
-        , subq_1.booking__ds__quarter
-        , subq_1.booking__ds__year
-        , subq_1.booking__ds__extract_year
-        , subq_1.booking__ds__extract_quarter
-        , subq_1.booking__ds__extract_month
-        , subq_1.booking__ds__extract_day
-        , subq_1.booking__ds__extract_dow
-        , subq_1.booking__ds__extract_doy
-        , subq_1.booking__ds_partitioned__day
-        , subq_1.booking__ds_partitioned__week
-        , subq_1.booking__ds_partitioned__month
-        , subq_1.booking__ds_partitioned__quarter
-        , subq_1.booking__ds_partitioned__year
-        , subq_1.booking__ds_partitioned__extract_year
-        , subq_1.booking__ds_partitioned__extract_quarter
-        , subq_1.booking__ds_partitioned__extract_month
-        , subq_1.booking__ds_partitioned__extract_day
-        , subq_1.booking__ds_partitioned__extract_dow
-        , subq_1.booking__ds_partitioned__extract_doy
-        , subq_1.booking__paid_at__day
-        , subq_1.booking__paid_at__week
-        , subq_1.booking__paid_at__month
-        , subq_1.booking__paid_at__quarter
-        , subq_1.booking__paid_at__year
-        , subq_1.booking__paid_at__extract_year
-        , subq_1.booking__paid_at__extract_quarter
-        , subq_1.booking__paid_at__extract_month
-        , subq_1.booking__paid_at__extract_day
-        , subq_1.booking__paid_at__extract_dow
-        , subq_1.booking__paid_at__extract_doy
-        , subq_1.metric_time__day
-        , subq_1.metric_time__week
-        , subq_1.metric_time__month
-        , subq_1.metric_time__quarter
-        , subq_1.metric_time__year
-        , subq_1.metric_time__extract_year
-        , subq_1.metric_time__extract_quarter
-        , subq_1.metric_time__extract_month
-        , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dow
-        , subq_1.metric_time__extract_doy
-        , subq_1.listing
-        , subq_1.guest
-        , subq_1.host
-        , subq_1.booking__listing
-        , subq_1.booking__guest
-        , subq_1.booking__host
-        , subq_1.is_instant
-        , subq_1.booking__is_instant
-        , subq_1.bookings
-        , subq_1.instant_bookings
-        , subq_1.booking_value
-        , subq_1.max_booking_value
-        , subq_1.min_booking_value
-        , subq_1.bookers
-        , subq_1.average_booking_value
-        , subq_1.referred_bookings
-        , subq_1.median_booking_value
-        , subq_1.booking_value_p99
-        , subq_1.discrete_booking_value_p99
-        , subq_1.approximate_continuous_booking_value_p99
-        , subq_1.approximate_discrete_booking_value_p99
-      FROM (
-        -- Metric Time Dimension 'ds'
-        SELECT
-          subq_0.ds__day
-          , subq_0.ds__week
-          , subq_0.ds__month
-          , subq_0.ds__quarter
-          , subq_0.ds__year
-          , subq_0.ds__extract_year
-          , subq_0.ds__extract_quarter
-          , subq_0.ds__extract_month
-          , subq_0.ds__extract_day
-          , subq_0.ds__extract_dow
-          , subq_0.ds__extract_doy
-          , subq_0.ds_partitioned__day
-          , subq_0.ds_partitioned__week
-          , subq_0.ds_partitioned__month
-          , subq_0.ds_partitioned__quarter
-          , subq_0.ds_partitioned__year
-          , subq_0.ds_partitioned__extract_year
-          , subq_0.ds_partitioned__extract_quarter
-          , subq_0.ds_partitioned__extract_month
-          , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dow
-          , subq_0.ds_partitioned__extract_doy
-          , subq_0.paid_at__day
-          , subq_0.paid_at__week
-          , subq_0.paid_at__month
-          , subq_0.paid_at__quarter
-          , subq_0.paid_at__year
-          , subq_0.paid_at__extract_year
-          , subq_0.paid_at__extract_quarter
-          , subq_0.paid_at__extract_month
-          , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dow
-          , subq_0.paid_at__extract_doy
-          , subq_0.booking__ds__day
-          , subq_0.booking__ds__week
-          , subq_0.booking__ds__month
-          , subq_0.booking__ds__quarter
-          , subq_0.booking__ds__year
-          , subq_0.booking__ds__extract_year
-          , subq_0.booking__ds__extract_quarter
-          , subq_0.booking__ds__extract_month
-          , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dow
-          , subq_0.booking__ds__extract_doy
-          , subq_0.booking__ds_partitioned__day
-          , subq_0.booking__ds_partitioned__week
-          , subq_0.booking__ds_partitioned__month
-          , subq_0.booking__ds_partitioned__quarter
-          , subq_0.booking__ds_partitioned__year
-          , subq_0.booking__ds_partitioned__extract_year
-          , subq_0.booking__ds_partitioned__extract_quarter
-          , subq_0.booking__ds_partitioned__extract_month
-          , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dow
-          , subq_0.booking__ds_partitioned__extract_doy
-          , subq_0.booking__paid_at__day
-          , subq_0.booking__paid_at__week
-          , subq_0.booking__paid_at__month
-          , subq_0.booking__paid_at__quarter
-          , subq_0.booking__paid_at__year
-          , subq_0.booking__paid_at__extract_year
-          , subq_0.booking__paid_at__extract_quarter
-          , subq_0.booking__paid_at__extract_month
-          , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dow
-          , subq_0.booking__paid_at__extract_doy
-          , subq_0.ds__day AS metric_time__day
-          , subq_0.ds__week AS metric_time__week
-          , subq_0.ds__month AS metric_time__month
-          , subq_0.ds__quarter AS metric_time__quarter
-          , subq_0.ds__year AS metric_time__year
-          , subq_0.ds__extract_year AS metric_time__extract_year
-          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
-          , subq_0.ds__extract_month AS metric_time__extract_month
-          , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dow AS metric_time__extract_dow
-          , subq_0.ds__extract_doy AS metric_time__extract_doy
-          , subq_0.listing
-          , subq_0.guest
-          , subq_0.host
-          , subq_0.booking__listing
-          , subq_0.booking__guest
-          , subq_0.booking__host
-          , subq_0.is_instant
-          , subq_0.booking__is_instant
-          , subq_0.bookings
-          , subq_0.instant_bookings
-          , subq_0.booking_value
-          , subq_0.max_booking_value
-          , subq_0.min_booking_value
-          , subq_0.bookers
-          , subq_0.average_booking_value
-          , subq_0.referred_bookings
-          , subq_0.median_booking_value
-          , subq_0.booking_value_p99
-          , subq_0.discrete_booking_value_p99
-          , subq_0.approximate_continuous_booking_value_p99
-          , subq_0.approximate_discrete_booking_value_p99
-        FROM (
-          -- Read Elements From Semantic Model 'bookings_source'
-          SELECT
-            1 AS bookings
-            , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
-            , bookings_source_src_28000.booking_value
-            , bookings_source_src_28000.booking_value AS max_booking_value
-            , bookings_source_src_28000.booking_value AS min_booking_value
-            , bookings_source_src_28000.guest_id AS bookers
-            , bookings_source_src_28000.booking_value AS average_booking_value
-            , bookings_source_src_28000.booking_value AS booking_payments
-            , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
-            , bookings_source_src_28000.booking_value AS median_booking_value
-            , bookings_source_src_28000.booking_value AS booking_value_p99
-            , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
-            , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
-            , bookings_source_src_28000.is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
-            , bookings_source_src_28000.is_instant AS booking__is_instant
-            , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
-            , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
-            , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
-            , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
-            , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
-            , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
-            , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
-            , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
-            , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAY_OF_WEEK FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
-            , bookings_source_src_28000.listing_id AS listing
-            , bookings_source_src_28000.guest_id AS guest
-            , bookings_source_src_28000.host_id AS host
-            , bookings_source_src_28000.listing_id AS booking__listing
-            , bookings_source_src_28000.guest_id AS booking__guest
-            , bookings_source_src_28000.host_id AS booking__host
-          FROM ***************************.fct_bookings bookings_source_src_28000
-        ) subq_0
-      ) subq_1
-      WHERE subq_1.metric_time__day BETWEEN timestamp '2020-01-03' AND timestamp '2020-01-05'
-    ) subq_2
-  ) subq_3
-) subq_4
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
deleted file mode 100644
index 1d8ac5c597..0000000000
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_time_constraint__plan0_optimized.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Compute Metrics via Expressions
-SELECT
-  COALESCE(bookings, 0) AS bookings_fill_nulls_with_0
-FROM (
-  -- Read Elements From Semantic Model 'bookings_source'
-  -- Metric Time Dimension 'ds'
-  -- Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]
-  -- Pass Only Elements: ['bookings',]
-  -- Aggregate Measures
-  SELECT
-    SUM(1) AS bookings
-  FROM ***************************.fct_bookings bookings_source_src_28000
-  WHERE DATE_TRUNC('day', ds) BETWEEN timestamp '2020-01-03' AND timestamp '2020-01-05'
-) subq_9
diff --git a/tests_metricflow/sql/compare_sql_plan.py b/tests_metricflow/sql/compare_sql_plan.py
index ebed45bbfd..1464f66c39 100644
--- a/tests_metricflow/sql/compare_sql_plan.py
+++ b/tests_metricflow/sql/compare_sql_plan.py
@@ -11,7 +11,7 @@
 
 from metricflow.protocols.sql_client import SqlClient
 from metricflow.sql.render.sql_plan_renderer import DefaultSqlQueryPlanRenderer
-from metricflow.sql.sql_plan import SqlQueryPlan, SqlQueryPlanNode
+from metricflow.sql.sql_plan import SqlPlan, SqlQueryPlanNode
 from tests_metricflow.fixtures.setup_fixtures import check_sql_engine_snapshot_marker
 from tests_metricflow.snapshot_utils import (
     _EXCLUDE_TABLE_ALIAS_REGEX,
@@ -26,7 +26,7 @@ def assert_default_rendered_sql_equal(
     sql_plan_node: SqlQueryPlanNode,
 ) -> None:
     """Helper function to render a select statement and compare with the one saved as a file."""
-    sql_query_plan = SqlQueryPlan(render_node=sql_plan_node, plan_id=DagId.from_str(plan_id))
+    sql_query_plan = SqlPlan(render_node=sql_plan_node, plan_id=DagId.from_str(plan_id))
     rendered_sql = DefaultSqlQueryPlanRenderer().render_sql_query_plan(sql_query_plan).sql
 
     assert_plan_snapshot_text_equal(
@@ -49,7 +49,7 @@ def assert_rendered_sql_equal(
     sql_client: SqlClient,
 ) -> None:
     """Helper function to render a select statement and compare with the one saved as a file."""
-    sql_query_plan = SqlQueryPlan(render_node=sql_plan_node, plan_id=DagId.from_str(plan_id))
+    sql_query_plan = SqlPlan(render_node=sql_plan_node, plan_id=DagId.from_str(plan_id))
 
     assert_rendered_sql_from_plan_equal(
         request=request,
@@ -62,7 +62,7 @@ def assert_rendered_sql_equal(
 def assert_rendered_sql_from_plan_equal(
     request: FixtureRequest,
     mf_test_configuration: MetricFlowTestConfiguration,
-    sql_query_plan: SqlQueryPlan,
+    sql_query_plan: SqlPlan,
     sql_client: SqlClient,
 ) -> None:
     """Similar to assert_rendered_sql_equal, but takes in a SQL query plan."""
@@ -90,7 +90,7 @@ def assert_rendered_sql_from_plan_equal(
 def assert_sql_plan_text_equal(  # noqa: D103
     request: FixtureRequest,
     mf_test_configuration: MetricFlowTestConfiguration,
-    sql_query_plan: SqlQueryPlan,
+    sql_query_plan: SqlPlan,
 ) -> None:
     assert_plan_snapshot_text_equal(
         request=request,
diff --git a/tests_metricflow/sql/optimizer/check_optimizer.py b/tests_metricflow/sql/optimizer/check_optimizer.py
index 7ba642f3e9..99f874743d 100644
--- a/tests_metricflow/sql/optimizer/check_optimizer.py
+++ b/tests_metricflow/sql/optimizer/check_optimizer.py
@@ -10,7 +10,7 @@
 
 from metricflow.sql.optimizer.sql_query_plan_optimizer import SqlQueryPlanOptimizer
 from metricflow.sql.render.sql_plan_renderer import SqlQueryPlanRenderer
-from metricflow.sql.sql_plan import SqlQueryPlan, SqlSelectStatementNode
+from metricflow.sql.sql_plan import SqlPlan, SqlSelectStatementNode
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +23,7 @@ def assert_optimizer_result_snapshot_equal(
     select_statement: SqlSelectStatementNode,
 ) -> None:
     """Helper to assert that the SQL snapshot of the optimizer result is the same as the stored one."""
-    sql_before_optimizing = sql_plan_renderer.render_sql_query_plan(SqlQueryPlan(select_statement)).sql
+    sql_before_optimizing = sql_plan_renderer.render_sql_query_plan(SqlPlan(select_statement)).sql
     logger.debug(
         LazyFormat(
             "Optimizing SELECT statement",
@@ -33,7 +33,7 @@ def assert_optimizer_result_snapshot_equal(
     )
 
     column_pruned_select_node = optimizer.optimize(select_statement)
-    sql_after_optimizing = sql_plan_renderer.render_sql_query_plan(SqlQueryPlan(column_pruned_select_node)).sql
+    sql_after_optimizing = sql_plan_renderer.render_sql_query_plan(SqlPlan(column_pruned_select_node)).sql
     logger.debug(
         LazyFormat(
             "Optimized SQL",