Adjust for new channel names
Merge pull request #264 from dirkmueller/release/stoney/master

Adjust for new channel names