Fix variable naming issues.