That may be true enough for "everday usage", but it's wrong. ....

Well, according to the NRA/ILA both of these terms share an identical meaning and have, historically, been used that way by: gun manufacturers, the American military, and gun owners.
Personally, I don't care what they're called; I just get tired of hearing this subject brought up over and over again by people who aren't aware of the correct historical situation and common usage.
At any rate the argument isn't with me; if you're unhappy with these definitions you might try writing to the NRA. See if they would be willing to modify their definitions to be more in line with your preference.
It's Called A What?