Fix variable naming