Can Name=GenericName go away now, please?