Further renamings to ColumnStoreMerge