Refactor some variables name