Variable name refactoring