Channel name tweaks (develop)

This is in dev_4_4 as https://github.com/openmicroscopy/openmicroscopy/pull/612. Now for develop.