HTML5 has become a very relevant term outside of technical circles and there it refers to all upcoming web technologies and – pretty much – always has. I guess you will just have to life with the two different meanings in two different context. I don’t think it’s a problem, I quite like HTML5 as a catch-all term for upcoming web technologies.
HTML5 [..] refers to all upcoming web technologies and – pretty much – always has.
HTML5 hasn't always referred to all upcoming web technologies. It's misuse is recent - and I think Steve Jobs has encouraged the change.
I find being asked for an 'HTML5' website problematic; a lot of clients use the term simply because they understand it's a buzz word - and don't actually know what they're asking for.