Missed some variable name updates