rewrote all the column names in the constant
fix conflict