Fix variable name bugs
Merge pull request #1 from juice49/varname-bugfix

Fix variable name bugs