Posted under Tags
Done. Updated the wikis to clarify that all frottage tags are distinct from one another:
frottage is supposed to be used for everything but the above according to the wiki, but in practice it's a mess. So I suggest making frottage the umbrella tag, if one is wanted.