Refactored channel names