You're right bro. You don't master individual tracks such as bass or vocals, you mix them. Once you have completed mixing all these tracks and you have a two track version (a stereo file) then you master that.
I think people who don't understand the difference use both words interchangeably.