Fix some variable names