Change "the name of the package will have to be changed" to "the Mozilla Foundation reserves the right to withdraw license to its trademarks" and I think it's completely unobjectionable. IANADD, IANAL. Thanks to Gervase for being such a pro.
Cheers, - Michael
