Some variable naming issues