Add Ch suffix to channel types
Merge https://github.com/remogatto/application