Changed some variable naming around.