Fix a refactoring bug on variables name