Variable Name Fixes