Change some variables names