Changed some variable names