Clarity

[bpalmeiro]

Small and petty one, mostly for bookkeeping. Let's make names in types a bit more meaningful. I'm thinking explicitly of channels meaning both channel number and number of channels. I'm sure there may be more of those instances around, so let's also use this issue as a call for checking the code.