Use consistent variable naming