Use consistent naming