Changed some variable name