Fixed small variable naming bugs