Use consistent names