Since there's no other such comments, I'm just going to chime in & say I'm extremely sympathetic.
This is a classic case of confusion, of two things being mixed together & fused, in terminology, when they are distinct areas. Our languages are, as many commenters point out, flexible & changing. But when that flexibility leads to the distinct & clear becoming mixed & hazy, that is usually a loss.