Fixed some variable naming