Forgot to update some old variable references