Use consistent variable definitions