Considering both of these terms are anachronisms originally created to describe distict devices which haven't been used in decades, getting bent out of shape over the difference between the two doesn't seem like a productive direction to steer the conversation.
As you allude to, seeing the forest instead of the trees reveals that people who are upset don't care how any of it works and they don't care which terms are assigned to which concepts. They care that their privacy is being violated. And no, they certainly don't care about court opinions concerning metadata not being data or call records not deserving privacy. The distinction between wiretaps, pen registers, and any other bullshit they dream up is not important to most people, so dragging the conversation into the weeds over the differences between the terms is not productive because it's a distinction without a meaningful difference (unless you're inclined to hassle privacy advocates.)
If somebody says "That man assaulted me; he punched me right in the face" the correct response is not "Actually that's battery, not assault"
(I don't know [or care] if that 'correction' is true or not, but it's one that's been repeated online ad nauseum.)