Fixed var names