Use a better GenericName