Changed some variables names.