Slight reorg/renaming before adding multichannel types