Rename (some) user-visible, non-code, trademarked names

[lleyton]

As the title says. My poor computer is having trouble running all of the tests, so someone should probably check that before merge (CI is disabled atm.)