As far as I've understood, upskirt and pantyshot are not the same thing. post #345793 is a pantyshot, but not upskirt. post #338969 would be an example of upskirt (and naturally also pantyshot).
If this distinction is correct, the wiki entries for both ought to be made a bit clearer in defining it (along with a tag cleanup).
Updated by 0xCCBA696