Domain terminology overloading

I’m having a bit of an issue with a couple of domain terms I’m using. message and channel are terms that are used in software for communication between and within software modules (especially for pub/sub, which we’re using). They are also used in the mass-notification domain with pretty much the same meanings as in the software domain. I’m looking for some naming conventions so I can distinguish between software messages and channels, and mass-notification messages and channels in my code. Any ideas?