Fix variable naming errors