fix var names