I disagree. I don't see a need to change anything. We don't need to encourage adoption with a terminology change, it's going to happen no matter what words are used for whatever. All this is doing is splitting the community and putting us against each other, when what we should be doing is aligning and working towards a common goal.
Words are arbitrary, Jack. They are abstract descriptors for things based on language and culture. They are all open to interpretation, by default. Primarily, they are a distraction. Let's stop dividing and distracting ourselves. There's too much work to do. Unity in action trumps semantic squabbles.