Fix variable naming bugs