modify some variables name