Use consistent naming convention