Fix variable names too