changed clas name
fixed conflict