more consistent variable naming