more consistent naming convention