Rename channel names for the sake of clarity

Helping things make a little more sense here.