Consistent naming convention