Missed some variable names while renaming