add some clarity to channel names
adjust channel names in funcs, too
Merge pull request #41 from canaryio/channel-clarity

Rename channel names for the sake of clarity