fix var and method names