fix some variables names