Fix trademark issues