Refactor of variable name