Changed variable naming convention