More name normalization

Names must match Trademarks exactly...