Changed some variables names