Reverted to orig naming conventions
Fixed bad var