Give the channel mode types better names
This code wasn't generic enough