I see your point. I fear that we're likely to be in a bit of a churn on terminology until the zeitgeist settles again. Until then we'll have to apply a small amount more mental effort (annoying, but not the end of the world) :-)