Fixed some variables name