some more channel friendly name fixes