Changed variable naming logic