fixed var names