Both terms are clearly defined and people choose to use them wrong, like you did with your examples.

People where always upset with the level of "wokeness" in Star Trek. The difference being that less where aware of it and if you wanted to complain you had to physically write a letter, go down to the post office, buy some stamps, and mail it in. Today you can just tweet some bullshit from your couch.