diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
index 9d9bbe892..ceb994321 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
@@ -46,11 +46,11 @@ docstring:
                         <!--   )                                                            -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_4') -->
+                            <!-- node_id = NodeId(id_str='sma_2') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_4') -->
+                                <!-- node_id = NodeId(id_str='rss_0') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
@@ -62,11 +62,11 @@ docstring:
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_5') -->
+                                <!-- node_id = NodeId(id_str='sma_3') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
-                                    <!-- node_id = NodeId(id_str='rss_5') -->
+                                    <!-- node_id = NodeId(id_str='rss_1') -->
                                     <!-- data_set = SemanticModelDataSet('listings_latest') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
index 045472d65..daed5b47d 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
@@ -33,7 +33,7 @@ docstring:
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_0') -->
+                                <!-- node_id = NodeId(id_str='rss_28020') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
@@ -63,7 +63,7 @@ docstring:
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
-                                <!-- node_id = NodeId(id_str='rss_1') -->
+                                <!-- node_id = NodeId(id_str='rss_28024') -->
                                 <!-- data_set = SemanticModelDataSet('listings_latest') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
index 61175bfdb..7e3863250 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
@@ -9,22 +9,22 @@ docstring:
         <!-- node_id = NodeId(id_str='wrd_1') -->
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_14') -->
+            <!-- node_id = NodeId(id_str='cm_13') -->
             <!-- metric_spec = MetricSpec(element_name='bookings_per_booker', filter_spec_set=WhereFilterSpecSet()) -->
             <!-- metric_spec = MetricSpec(element_name='bookings_per_dollar', filter_spec_set=WhereFilterSpecSet()) -->
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
-                <!-- node_id = NodeId(id_str='cm_13') -->
+                <!-- node_id = NodeId(id_str='cm_12') -->
                 <!-- metric_spec = MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet()) -->
                 <!-- metric_spec = MetricSpec(element_name='bookers', filter_spec_set=WhereFilterSpecSet()) -->
                 <!-- metric_spec = MetricSpec(element_name='booking_value', filter_spec_set=WhereFilterSpecSet()) -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
-                    <!-- node_id = NodeId(id_str='am_9') -->
+                    <!-- node_id = NodeId(id_str='am_8') -->
                     <FilterElementsNode>
                         <!-- description =                                                                        -->
                         <!--   "Pass Only Elements: ['bookings', 'bookers', 'booking_value', 'metric_time__day']" -->
-                        <!-- node_id = NodeId(id_str='pfe_9') -->
+                        <!-- node_id = NodeId(id_str='pfe_8') -->
                         <!-- include_spec = MeasureSpec(element_name='bookings') -->
                         <!-- include_spec = MeasureSpec(element_name='bookers') -->
                         <!-- include_spec = MeasureSpec(element_name='booking_value') -->
@@ -36,11 +36,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_6') -->
+                            <!-- node_id = NodeId(id_str='sma_3') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_6') -->
+                                <!-- node_id = NodeId(id_str='rss_2') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
index 84d1ad244..190587e71 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
@@ -31,11 +31,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_3') -->
+                            <!-- node_id = NodeId(id_str='sma_2') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_3') -->
+                                <!-- node_id = NodeId(id_str='rss_0') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
@@ -61,11 +61,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_2') -->
+                            <!-- node_id = NodeId(id_str='sma_1') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
-                                <!-- node_id = NodeId(id_str='rss_2') -->
+                                <!-- node_id = NodeId(id_str='rss_28024') -->
                                 <!-- data_set = SemanticModelDataSet('listings_latest') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
index 06f2e89f3..843a966af 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
@@ -36,7 +36,7 @@ docstring:
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_0') -->
+                                <!-- node_id = NodeId(id_str='rss_28020') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
@@ -105,11 +105,11 @@ docstring:
                             <!--   )                                                               -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_1') -->
+                                <!-- node_id = NodeId(id_str='sma_0') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                    <!-- node_id = NodeId(id_str='rss_1') -->
+                                    <!-- node_id = NodeId(id_str='rss_28020') -->
                                     <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
index 23f453397..70f4fd1de 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
@@ -40,11 +40,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_2') -->
+                            <!-- node_id = NodeId(id_str='sma_1') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_2') -->
+                                <!-- node_id = NodeId(id_str='rss_0') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_combined__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_combined__dfpo_0.xml
index 2363e1fb5..6c79f2d62 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_combined__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_combined__dfpo_0.xml
@@ -12,20 +12,20 @@ docstring:
         <!-- node_id = NodeId(id_str='wrd_1') -->
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_8') -->
+            <!-- node_id = NodeId(id_str='cm_7') -->
             <!-- metric_spec = MetricSpec(element_name='derived_shared_alias_1a', filter_spec_set=WhereFilterSpecSet()) -->
             <!-- metric_spec = MetricSpec(element_name='derived_shared_alias_1b', filter_spec_set=WhereFilterSpecSet()) -->
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
-                <!-- node_id = NodeId(id_str='cm_7') -->
+                <!-- node_id = NodeId(id_str='cm_6') -->
                 <!-- metric_spec =                                                                                     -->
                 <!--   MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet(), alias='shared_alias') -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
-                    <!-- node_id = NodeId(id_str='am_3') -->
+                    <!-- node_id = NodeId(id_str='am_2') -->
                     <FilterElementsNode>
                         <!-- description = "Pass Only Elements: ['bookings', 'booking__is_instant']" -->
-                        <!-- node_id = NodeId(id_str='pfe_3') -->
+                        <!-- node_id = NodeId(id_str='pfe_2') -->
                         <!-- include_spec = MeasureSpec(element_name='bookings') -->
                         <!-- include_spec =                                               -->
                         <!--   DimensionSpec(                                             -->
@@ -35,11 +35,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_2') -->
+                            <!-- node_id = NodeId(id_str='sma_1') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_2') -->
+                                <!-- node_id = NodeId(id_str='rss_0') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_not_combined__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_not_combined__dfpo_0.xml
index d042ec224..7d9093694 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_not_combined__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_same_alias_components_not_combined__dfpo_0.xml
@@ -42,7 +42,7 @@ docstring:
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                    <!-- node_id = NodeId(id_str='rss_0') -->
+                                    <!-- node_id = NodeId(id_str='rss_28020') -->
                                     <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
@@ -79,11 +79,11 @@ docstring:
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_1') -->
+                                <!-- node_id = NodeId(id_str='sma_0') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                    <!-- node_id = NodeId(id_str='rss_1') -->
+                                    <!-- node_id = NodeId(id_str='rss_28020') -->
                                     <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
index a2678a5d7..583128915 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
@@ -41,7 +41,7 @@ docstring:
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_0') -->
+                                <!-- node_id = NodeId(id_str='rss_28020') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
@@ -80,11 +80,11 @@ docstring:
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_3') -->
+                                <!-- node_id = NodeId(id_str='sma_1') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                    <!-- node_id = NodeId(id_str='rss_3') -->
+                                    <!-- node_id = NodeId(id_str='rss_0') -->
                                     <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_duplicate_measures__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_duplicate_measures__dfpo_0.xml
index c4e4182d9..4156370f5 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_duplicate_measures__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_duplicate_measures__dfpo_0.xml
@@ -9,19 +9,19 @@ docstring:
         <!-- node_id = NodeId(id_str='wrd_1') -->
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_8') -->
+            <!-- node_id = NodeId(id_str='cm_7') -->
             <!-- metric_spec = MetricSpec(element_name='derived_bookings_0', filter_spec_set=WhereFilterSpecSet()) -->
             <!-- metric_spec = MetricSpec(element_name='derived_bookings_1', filter_spec_set=WhereFilterSpecSet()) -->
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
-                <!-- node_id = NodeId(id_str='cm_7') -->
+                <!-- node_id = NodeId(id_str='cm_6') -->
                 <!-- metric_spec = MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet()) -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
-                    <!-- node_id = NodeId(id_str='am_3') -->
+                    <!-- node_id = NodeId(id_str='am_2') -->
                     <FilterElementsNode>
                         <!-- description = "Pass Only Elements: ['bookings', 'metric_time__day']" -->
-                        <!-- node_id = NodeId(id_str='pfe_3') -->
+                        <!-- node_id = NodeId(id_str='pfe_2') -->
                         <!-- include_spec = MeasureSpec(element_name='bookings') -->
                         <!-- include_spec =                                                                  -->
                         <!--   TimeDimensionSpec(                                                            -->
@@ -31,11 +31,11 @@ docstring:
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_2') -->
+                            <!-- node_id = NodeId(id_str='sma_1') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                <!-- node_id = NodeId(id_str='rss_2') -->
+                                <!-- node_id = NodeId(id_str='rss_0') -->
                                 <!-- data_set = SemanticModelDataSet('bookings_source') -->
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
index b87ef8f5d..b56e8f02e 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
@@ -12,7 +12,7 @@ docstring:
         <!-- node_id = NodeId(id_str='wrd_1') -->
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
-            <!-- node_id = NodeId(id_str='cm_12') -->
+            <!-- node_id = NodeId(id_str='cm_11') -->
             <!-- metric_spec =                                                                                             -->
             <!--   MetricSpec(element_name='instant_plus_non_referred_bookings_pct', filter_spec_set=WhereFilterSpecSet()) -->
             <CombineAggregatedOutputsNode>
@@ -54,11 +54,11 @@ docstring:
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_2') -->
+                                    <!-- node_id = NodeId(id_str='sma_1') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                        <!-- node_id = NodeId(id_str='rss_2') -->
+                                        <!-- node_id = NodeId(id_str='rss_0') -->
                                         <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
@@ -68,7 +68,7 @@ docstring:
                 </ComputeMetricsNode>
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
-                    <!-- node_id = NodeId(id_str='cm_11') -->
+                    <!-- node_id = NodeId(id_str='cm_10') -->
                     <!-- metric_spec =                             -->
                     <!--   MetricSpec(                             -->
                     <!--     element_name='instant_bookings',      -->
@@ -78,11 +78,11 @@ docstring:
                     <!-- metric_spec = MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet()) -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
-                        <!-- node_id = NodeId(id_str='am_8') -->
+                        <!-- node_id = NodeId(id_str='am_7') -->
                         <FilterElementsNode>
                             <!-- description =                                                                -->
                             <!--   "Pass Only Elements: ['instant_bookings', 'bookings', 'metric_time__day']" -->
-                            <!-- node_id = NodeId(id_str='pfe_8') -->
+                            <!-- node_id = NodeId(id_str='pfe_7') -->
                             <!-- include_spec = MeasureSpec(element_name='instant_bookings') -->
                             <!-- include_spec = MeasureSpec(element_name='bookings') -->
                             <!-- include_spec =                                                                  -->
@@ -93,11 +93,11 @@ docstring:
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_5') -->
+                                <!-- node_id = NodeId(id_str='sma_2') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
-                                    <!-- node_id = NodeId(id_str='rss_5') -->
+                                    <!-- node_id = NodeId(id_str='rss_1') -->
                                     <!-- data_set = SemanticModelDataSet('bookings_source') -->
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>