Use consistent variable names