fix var name to suit refactoring