Changed variable naming