diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
index 3bd86214d5..e261d07fdc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
@@ -1,8 +1,8 @@
 == Physical Plan ==
-* ColumnarToRow (43)
-+- CometTakeOrderedAndProject (42)
-   +- CometFilter (41)
-      +- CometWindowExec (40)
+TakeOrderedAndProject (43)
++- * Filter (42)
+   +- Window (41)
+      +- * ColumnarToRow (40)
          +- CometSort (39)
             +- CometColumnarExchange (38)
                +- CometProject (37)
@@ -213,20 +213,20 @@ Arguments: hashpartitioning(item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarSh
 Input [4]: [item_sk#22, d_date#23, web_sales#24, store_sales#25]
 Arguments: [item_sk#22, d_date#23, web_sales#24, store_sales#25], [item_sk#22 ASC NULLS FIRST, d_date#23 ASC NULLS FIRST]
 
-(40) CometWindowExec
+(40) ColumnarToRow [codegen id : 5]
 Input [4]: [item_sk#22, d_date#23, web_sales#24, store_sales#25]
-Arguments: [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27], [max(web_sales#24) windowspecdefinition(item_sk#22, d_date#23 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#26, max(store_sales#25) windowspecdefinition(item_sk#22, d_date#23 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#27], [item_sk#22], [d_date#23 ASC NULLS FIRST]
 
-(41) CometFilter
-Input [6]: [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27]
-Condition : ((isnotnull(web_cumulative#26) AND isnotnull(store_cumulative#27)) AND (web_cumulative#26 > store_cumulative#27))
+(41) Window
+Input [4]: [item_sk#22, d_date#23, web_sales#24, store_sales#25]
+Arguments: [max(web_sales#24) windowspecdefinition(item_sk#22, d_date#23 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#26, max(store_sales#25) windowspecdefinition(item_sk#22, d_date#23 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#27], [item_sk#22], [d_date#23 ASC NULLS FIRST]
 
-(42) CometTakeOrderedAndProject
+(42) Filter [codegen id : 6]
 Input [6]: [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[item_sk#22 ASC NULLS FIRST,d_date#23 ASC NULLS FIRST], output=[item_sk#22,d_date#23,web_sales#24,store_sales#25,web_cumulative#26,store_cumulative#27]), [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27], 100, [item_sk#22 ASC NULLS FIRST, d_date#23 ASC NULLS FIRST], [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27]
+Condition : ((isnotnull(web_cumulative#26) AND isnotnull(store_cumulative#27)) AND (web_cumulative#26 > store_cumulative#27))
 
-(43) ColumnarToRow [codegen id : 5]
+(43) TakeOrderedAndProject
 Input [6]: [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27]
+Arguments: 100, [item_sk#22 ASC NULLS FIRST, d_date#23 ASC NULLS FIRST], [item_sk#22, d_date#23, web_sales#24, store_sales#25, web_cumulative#26, store_cumulative#27]
 
 ===== Subqueries =====
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
index 0e5a8e3d7f..edc1ef2514 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
@@ -1,62 +1,64 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-        CometFilter [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-          CometWindowExec [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-            CometSort [item_sk,d_date,web_sales,store_sales]
-              CometColumnarExchange [item_sk] #1
-                CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
-                  CometSortMergeJoin [item_sk,d_date,cume_sales,item_sk,d_date,cume_sales]
-                    CometSort [item_sk,d_date,cume_sales]
-                      CometColumnarExchange [item_sk,d_date] #2
-                        RowToColumnar
-                          WholeStageCodegen (2)
-                            Project [item_sk,d_date,cume_sales]
-                              InputAdapter
-                                Window [_w0,ws_item_sk,d_date]
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometSort [item_sk,d_date,_w0,ws_item_sk]
-                                          CometColumnarExchange [ws_item_sk] #3
-                                            CometHashAggregate [item_sk,d_date,_w0,ws_item_sk,sum,sum(UnscaledValue(ws_sales_price))]
-                                              CometColumnarExchange [ws_item_sk,d_date] #4
-                                                CometHashAggregate [ws_item_sk,d_date,sum,ws_sales_price]
-                                                  CometProject [ws_item_sk,ws_sales_price,d_date]
-                                                    CometBroadcastHashJoin [ws_item_sk,ws_sales_price,ws_sold_date_sk,d_date_sk,d_date]
-                                                      CometFilter [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                          SubqueryBroadcast [d_date_sk] #1
-                                                            BroadcastExchange #5
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_date_sk,d_date]
-                                                                      CometFilter [d_date_sk,d_date,d_month_seq]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                                      CometBroadcastExchange [d_date_sk,d_date] #6
-                                                        CometProject [d_date_sk,d_date]
-                                                          CometFilter [d_date_sk,d_date,d_month_seq]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                    CometSort [item_sk,d_date,cume_sales]
-                      CometColumnarExchange [item_sk,d_date] #7
-                        RowToColumnar
-                          WholeStageCodegen (4)
-                            Project [item_sk,d_date,cume_sales]
-                              InputAdapter
-                                Window [_w0,ss_item_sk,d_date]
-                                  WholeStageCodegen (3)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometSort [item_sk,d_date,_w0,ss_item_sk]
-                                          CometColumnarExchange [ss_item_sk] #8
-                                            CometHashAggregate [item_sk,d_date,_w0,ss_item_sk,sum,sum(UnscaledValue(ss_sales_price))]
-                                              CometColumnarExchange [ss_item_sk,d_date] #9
-                                                CometHashAggregate [ss_item_sk,d_date,sum,ss_sales_price]
-                                                  CometProject [ss_item_sk,ss_sales_price,d_date]
-                                                    CometBroadcastHashJoin [ss_item_sk,ss_sales_price,ss_sold_date_sk,d_date_sk,d_date]
-                                                      CometFilter [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                      ReusedExchange [d_date_sk,d_date] #6
+TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
+  WholeStageCodegen (6)
+    Filter [web_cumulative,store_cumulative]
+      InputAdapter
+        Window [web_sales,item_sk,d_date,store_sales]
+          WholeStageCodegen (5)
+            ColumnarToRow
+              InputAdapter
+                CometSort [item_sk,d_date,web_sales,store_sales]
+                  CometColumnarExchange [item_sk] #1
+                    CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
+                      CometSortMergeJoin [item_sk,d_date,cume_sales,item_sk,d_date,cume_sales]
+                        CometSort [item_sk,d_date,cume_sales]
+                          CometColumnarExchange [item_sk,d_date] #2
+                            RowToColumnar
+                              WholeStageCodegen (2)
+                                Project [item_sk,d_date,cume_sales]
+                                  InputAdapter
+                                    Window [_w0,ws_item_sk,d_date]
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometSort [item_sk,d_date,_w0,ws_item_sk]
+                                              CometColumnarExchange [ws_item_sk] #3
+                                                CometHashAggregate [item_sk,d_date,_w0,ws_item_sk,sum,sum(UnscaledValue(ws_sales_price))]
+                                                  CometColumnarExchange [ws_item_sk,d_date] #4
+                                                    CometHashAggregate [ws_item_sk,d_date,sum,ws_sales_price]
+                                                      CometProject [ws_item_sk,ws_sales_price,d_date]
+                                                        CometBroadcastHashJoin [ws_item_sk,ws_sales_price,ws_sold_date_sk,d_date_sk,d_date]
+                                                          CometFilter [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                              SubqueryBroadcast [d_date_sk] #1
+                                                                BroadcastExchange #5
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [d_date_sk,d_date]
+                                                                          CometFilter [d_date_sk,d_date,d_month_seq]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                                          CometBroadcastExchange [d_date_sk,d_date] #6
+                                                            CometProject [d_date_sk,d_date]
+                                                              CometFilter [d_date_sk,d_date,d_month_seq]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                        CometSort [item_sk,d_date,cume_sales]
+                          CometColumnarExchange [item_sk,d_date] #7
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                Project [item_sk,d_date,cume_sales]
+                                  InputAdapter
+                                    Window [_w0,ss_item_sk,d_date]
+                                      WholeStageCodegen (3)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometSort [item_sk,d_date,_w0,ss_item_sk]
+                                              CometColumnarExchange [ss_item_sk] #8
+                                                CometHashAggregate [item_sk,d_date,_w0,ss_item_sk,sum,sum(UnscaledValue(ss_sales_price))]
+                                                  CometColumnarExchange [ss_item_sk,d_date] #9
+                                                    CometHashAggregate [ss_item_sk,d_date,sum,ss_sales_price]
+                                                      CometProject [ss_item_sk,ss_sales_price,d_date]
+                                                        CometBroadcastHashJoin [ss_item_sk,ss_sales_price,ss_sold_date_sk,d_date_sk,d_date]
+                                                          CometFilter [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                              ReusedSubquery [d_date_sk] #1
+                                                          ReusedExchange [d_date_sk,d_date] #6