Changed some variable names…