diff --git a/tests_metricflow/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml b/tests_metricflow/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
index 1ade48ce17..45c1d57b39 100644
--- a/tests_metricflow/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
@@ -19,7 +19,7 @@
                     <!--     entity_links=(EntityReference(element_name='cyclic_entity'),), -->
                     <!--   )                                                                -->
                     <!-- distinct = False -->
-                    <JoinToBaseOutputNode>
+                    <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_0') -->
                         <!-- join0_for_node_id_pfe_1 =                                            -->
@@ -57,7 +57,7 @@
                                 <!-- data_set = SemanticModelDataSet('listings_latest_cyclic') -->
                             </ReadSqlSourceNode>
                         </FilterElementsNode>
-                    </JoinToBaseOutputNode>
+                    </JoinOnEntitiesNode>
                 </FilterElementsNode>
             </AggregateMeasuresNode>
         </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
index 7b3ec666b1..b90e88c3b1 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
@@ -24,7 +24,7 @@
                         <!--     entity_links=(EntityReference(element_name='listing'),), -->
                         <!--   )                                                          -->
                         <!-- distinct = False -->
-                        <JoinToBaseOutputNode>
+                        <JoinOnEntitiesNode>
                             <!-- description = 'Join Standard Outputs' -->
                             <!-- node_id = NodeId(id_str='jso_0') -->
                             <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -68,7 +68,7 @@
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
                             </FilterElementsNode>
-                        </JoinToBaseOutputNode>
+                        </JoinOnEntitiesNode>
                     </FilterElementsNode>
                 </AggregateMeasuresNode>
             </ComputeMetricsNode>
@@ -91,7 +91,7 @@
                         <!--     entity_links=(EntityReference(element_name='listing'),), -->
                         <!--   )                                                          -->
                         <!-- distinct = False -->
-                        <JoinToBaseOutputNode>
+                        <JoinOnEntitiesNode>
                             <!-- description = 'Join Standard Outputs' -->
                             <!-- node_id = NodeId(id_str='jso_1') -->
                             <!-- join0_for_node_id_pfe_4 =                                      -->
@@ -136,7 +136,7 @@
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
                             </FilterElementsNode>
-                        </JoinToBaseOutputNode>
+                        </JoinOnEntitiesNode>
                     </FilterElementsNode>
                 </AggregateMeasuresNode>
             </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dimensions_with_time_constraint__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dimensions_with_time_constraint__dfp_0.xml
index 99530dd03e..c83d58ff9a 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dimensions_with_time_constraint__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dimensions_with_time_constraint__dfp_0.xml
@@ -14,7 +14,7 @@
                 <!-- node_id = NodeId(id_str='ctr_1') -->
                 <!-- time_range_start = '2020-01-01T00:00:00' -->
                 <!-- time_range_end = '2020-01-03T00:00:00' -->
-                <JoinToBaseOutputNode>
+                <JoinOnEntitiesNode>
                     <!-- description = 'Join Standard Outputs' -->
                     <!-- node_id = NodeId(id_str='jso_0') -->
                     <!-- join0_for_node_id_pfe_1 =                                                            -->
@@ -40,7 +40,7 @@
                             </ReadSqlSourceNode>
                         </MetricTimeDimensionTransformNode>
                     </FilterElementsNode>
-                </JoinToBaseOutputNode>
+                </JoinOnEntitiesNode>
             </ConstrainTimeRangeNode>
         </FilterElementsNode>
     </WriteToResultDataframeNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
index 37d092fc5a..4993c6a9ef 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
@@ -58,7 +58,7 @@
                     <!--       ),                                                         -->
                     <!--     ),                                                           -->
                     <!--   )                                                              -->
-                    <JoinToBaseOutputNode>
+                    <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_0') -->
                         <!-- join0_for_node_id_pfe_1 =                                   -->
@@ -84,7 +84,7 @@
                                 <!-- data_set = SemanticModelDataSet('users_latest') -->
                             </ReadSqlSourceNode>
                         </FilterElementsNode>
-                    </JoinToBaseOutputNode>
+                    </JoinOnEntitiesNode>
                 </WhereConstraintNode>
             </FilterElementsNode>
         </OrderByLimitNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
index 1c9054d896..65069397ea 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
@@ -25,7 +25,7 @@
                     <!--     entity_links=(EntityReference(element_name='listing'),), -->
                     <!--   )                                                          -->
                     <!-- distinct = False -->
-                    <JoinToBaseOutputNode>
+                    <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_0') -->
                         <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -73,7 +73,7 @@
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
                         </FilterElementsNode>
-                    </JoinToBaseOutputNode>
+                    </JoinOnEntitiesNode>
                 </FilterElementsNode>
             </AggregateMeasuresNode>
         </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
index b7e705562b..c6ff54aff1 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
@@ -119,7 +119,7 @@
                                     <!-- include_spec =                                                        -->
                                     <!--   TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                                     <!-- distinct = False -->
-                                    <JoinToBaseOutputNode>
+                                    <JoinOnEntitiesNode>
                                         <!-- description = 'Join Standard Outputs' -->
                                         <!-- node_id = NodeId(id_str='jso_0') -->
                                         <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -168,7 +168,7 @@
                                                 </ReadSqlSourceNode>
                                             </MetricTimeDimensionTransformNode>
                                         </FilterElementsNode>
-                                    </JoinToBaseOutputNode>
+                                    </JoinOnEntitiesNode>
                                 </FilterElementsNode>
                             </WhereConstraintNode>
                         </FilterElementsNode>
@@ -284,7 +284,7 @@
                                     <!-- include_spec =                                                        -->
                                     <!--   TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                                     <!-- distinct = False -->
-                                    <JoinToBaseOutputNode>
+                                    <JoinOnEntitiesNode>
                                         <!-- description = 'Join Standard Outputs' -->
                                         <!-- node_id = NodeId(id_str='jso_1') -->
                                         <!-- join0_for_node_id_pfe_5 =                                      -->
@@ -332,7 +332,7 @@
                                                 </ReadSqlSourceNode>
                                             </MetricTimeDimensionTransformNode>
                                         </FilterElementsNode>
-                                    </JoinToBaseOutputNode>
+                                    </JoinOnEntitiesNode>
                                 </FilterElementsNode>
                             </WhereConstraintNode>
                         </FilterElementsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
index 3630a0079d..7c57dc644e 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
@@ -42,7 +42,7 @@
                             <!--     metric_subquery_entity_links=(EntityReference(element_name='listing'),), -->
                             <!--   )                                                                          -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_2 =                                      -->
@@ -107,7 +107,7 @@
                                         </AggregateMeasuresNode>
                                     </ComputeMetricsNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </WhereConstraintNode>
                 </FilterElementsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
index 2eb712ec67..2ad14bb3e6 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
@@ -62,7 +62,7 @@
                             <!--     metric_subquery_entity_links=(EntityReference(element_name='listing'),), -->
                             <!--   )                                                                          -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_2 =                                      -->
@@ -127,7 +127,7 @@
                                         </AggregateMeasuresNode>
                                     </ComputeMetricsNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </WhereConstraintNode>
                 </FilterElementsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_time_with_other_dimensions__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_time_with_other_dimensions__dfp_0.xml
index 077dec9a99..18c22f048b 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_time_with_other_dimensions__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_time_with_other_dimensions__dfp_0.xml
@@ -14,7 +14,7 @@
             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=MONTH) -->
             <!-- distinct = True -->
-            <JoinToBaseOutputNode>
+            <JoinOnEntitiesNode>
                 <!-- description = 'Join Standard Outputs' -->
                 <!-- node_id = NodeId(id_str='jso_0') -->
                 <!-- join0_for_node_id_pfe_2 =                                                            -->
@@ -59,7 +59,7 @@
                         <!-- data_set = SemanticModelDataSet('users_latest') -->
                     </ReadSqlSourceNode>
                 </FilterElementsNode>
-            </JoinToBaseOutputNode>
+            </JoinOnEntitiesNode>
         </FilterElementsNode>
     </WriteToResultDataframeNode>
 </DataflowPlan>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
index a99dea7083..73f42dfb84 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -28,7 +28,7 @@
                             <!--   )                                                          -->
                             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -73,7 +73,7 @@
                                         </ReadSqlSourceNode>
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </AggregateMeasuresNode>
                 </ComputeMetricsNode>
@@ -96,7 +96,7 @@
                             <!--   )                                                          -->
                             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_1') -->
                                 <!-- join0_for_node_id_pfe_4 =                                      -->
@@ -141,7 +141,7 @@
                                         </ReadSqlSourceNode>
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </AggregateMeasuresNode>
                 </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index 1aaf339860..5f40f7ab69 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -22,7 +22,7 @@
                     <!--     ),                                             -->
                     <!--   )                                                -->
                     <!-- distinct = False -->
-                    <JoinToBaseOutputNode>
+                    <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_1') -->
                         <!-- join0_for_node_id_pfe_2 =                                         -->
@@ -74,7 +74,7 @@
                             <!-- include_spec = TimeDimensionSpec(element_name='ds_partitioned', time_granularity=DAY) -->
                             <!-- include_spec = LinklessEntitySpec(element_name='account_id') -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_0 =                                          -->
@@ -270,9 +270,9 @@
                                         <!-- data_set = SemanticModelDataSet('customer_table') -->
                                     </ReadSqlSourceNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
-                    </JoinToBaseOutputNode>
+                    </JoinOnEntitiesNode>
                 </FilterElementsNode>
             </AggregateMeasuresNode>
         </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
index b90a880dda..f939bcdf1b 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -28,7 +28,7 @@
                             <!--   )                                                          -->
                             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -73,7 +73,7 @@
                                         </ReadSqlSourceNode>
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </AggregateMeasuresNode>
                 </ComputeMetricsNode>
@@ -96,7 +96,7 @@
                             <!--   )                                                          -->
                             <!-- include_spec = TimeDimensionSpec(element_name='metric_time', time_granularity=DAY) -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_1') -->
                                 <!-- join0_for_node_id_pfe_4 =                                      -->
@@ -141,7 +141,7 @@
                                         </ReadSqlSourceNode>
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </AggregateMeasuresNode>
                 </ComputeMetricsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
index f885245449..159ef536f6 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
@@ -116,7 +116,7 @@
                             <!--     entity_links=(EntityReference(element_name='listing'),), -->
                             <!--   )                                                          -->
                             <!-- distinct = False -->
-                            <JoinToBaseOutputNode>
+                            <JoinOnEntitiesNode>
                                 <!-- description = 'Join Standard Outputs' -->
                                 <!-- node_id = NodeId(id_str='jso_0') -->
                                 <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -165,7 +165,7 @@
                                         </ReadSqlSourceNode>
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
-                            </JoinToBaseOutputNode>
+                            </JoinOnEntitiesNode>
                         </FilterElementsNode>
                     </WhereConstraintNode>
                 </FilterElementsNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
index 783785f5cb..9a9099768e 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
@@ -100,7 +100,7 @@
                         <!--     entity_links=(EntityReference(element_name='listing'),), -->
                         <!--   )                                                          -->
                         <!-- distinct = False -->
-                        <JoinToBaseOutputNode>
+                        <JoinOnEntitiesNode>
                             <!-- description = 'Join Standard Outputs' -->
                             <!-- node_id = NodeId(id_str='jso_0') -->
                             <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -143,7 +143,7 @@
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
                             </FilterElementsNode>
-                        </JoinToBaseOutputNode>
+                        </JoinOnEntitiesNode>
                     </FilterElementsNode>
                 </WhereConstraintNode>
             </AggregateMeasuresNode>
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
index 3e12b66d6e..ae6b453518 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -9,7 +9,7 @@
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
-                <JoinToBaseOutputNode>
+                <JoinOnEntitiesNode>
                     <!-- description = 'Join Standard Outputs' -->
                     <!-- node_id = NodeId(id_str='jso_0') -->
                     <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -42,7 +42,7 @@
                             <!-- data_set = SemanticModelDataSet('listings_latest') -->
                         </ReadSqlSourceNode>
                     </FilterElementsNode>
-                </JoinToBaseOutputNode>
+                </JoinOnEntitiesNode>
             </AggregateMeasuresNode>
         </ComputeMetricsNode>
     </WriteToResultDataframeNode>
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
index 7b3ec666b1..b90e88c3b1 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
@@ -24,7 +24,7 @@
                         <!--     entity_links=(EntityReference(element_name='listing'),), -->
                         <!--   )                                                          -->
                         <!-- distinct = False -->
-                        <JoinToBaseOutputNode>
+                        <JoinOnEntitiesNode>
                             <!-- description = 'Join Standard Outputs' -->
                             <!-- node_id = NodeId(id_str='jso_0') -->
                             <!-- join0_for_node_id_pfe_1 =                                      -->
@@ -68,7 +68,7 @@
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
                             </FilterElementsNode>
-                        </JoinToBaseOutputNode>
+                        </JoinOnEntitiesNode>
                     </FilterElementsNode>
                 </AggregateMeasuresNode>
             </ComputeMetricsNode>
@@ -91,7 +91,7 @@
                         <!--     entity_links=(EntityReference(element_name='listing'),), -->
                         <!--   )                                                          -->
                         <!-- distinct = False -->
-                        <JoinToBaseOutputNode>
+                        <JoinOnEntitiesNode>
                             <!-- description = 'Join Standard Outputs' -->
                             <!-- node_id = NodeId(id_str='jso_1') -->
                             <!-- join0_for_node_id_pfe_4 =                                      -->
@@ -136,7 +136,7 @@
                                     </ReadSqlSourceNode>
                                 </MetricTimeDimensionTransformNode>
                             </FilterElementsNode>
-                        </JoinToBaseOutputNode>
+                        </JoinOnEntitiesNode>
                     </FilterElementsNode>
                 </AggregateMeasuresNode>
             </ComputeMetricsNode>
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 c672eced1d..3d6bb14838 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
@@ -24,7 +24,7 @@
                     <!--     entity_links=(EntityReference(element_name='listing'),), -->
                     <!--   )                                                          -->
                     <!-- distinct = False -->
-                    <JoinToBaseOutputNode>
+                    <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_4') -->
                         <!-- join0_for_node_id_pfe_13 =                                     -->
@@ -70,7 +70,7 @@
                                 </ReadSqlSourceNode>
                             </MetricTimeDimensionTransformNode>
                         </FilterElementsNode>
-                    </JoinToBaseOutputNode>
+                    </JoinOnEntitiesNode>
                 </FilterElementsNode>
             </AggregateMeasuresNode>
         </ComputeMetricsNode>