rename configuration
Merge branch 'channel'