AE: Move to using sources rather than channels
AE: Use the source name in the histograms and match the sources