Consistent naming with those generated from rival project