Modified some variable names