Generic names, better date validation