Fixed var name bugs.