Refactor variables name