Correct variables names