Changed some variable naming