Merge channel prefix patches, and rename per_channel_prefix.py to prefixes.py