fixing variable naming problems