BTW, it's been a long time since I read "public address" to refer to "address".
I usually only use it to refer to my addresses that are already shared in public.
You're likely quite right, P2MS is realy rare and uncommon. And Pay-to-PubKey has likely only a relevance for the first few tenthousend blocks until it has been replaced by P2PKH.
In the context of Bitcoin private key, public key and address I like to call the latter "public address", because, well, it's supposed to be public and revealing it is no problem, except if you make it clear it's your Bitcoin address which would allow an attribution of the address to you.