Use more consistent naming