Fixed some variable names after the big merge