Use consistent naming scheme