Use consistent terminology for channel directory
Merge pull request #682 from pafcu/master

Use consistent terminology for channel directory