Fix some broken variable names