Fixup Trademarks