Fixed variable name bugs.