Fixed some variable/argument names