Rename common_column_set to column_set