modify some variables names