Sush | #1750 | making generic name mandatory