More consistent variable naming