revise the variable name
solve the conflit