Fixes some errors with variable names