Vars names refactoring