Fix variable name errors