Rationalized more of the channel names and updated the documentation.