Updated some variable names