Changed variables name