[#1198] Fix references to ChannelBuffer and ChannelBuffers