Fix Variable Name Bugs