I've found having "top" and "bottom" as catch-all terms quite useful:
"top" - someone who is a controler, dominant and/or sadist "bottom" - someone who is a controlee, submissive and/or masochist
These used to have slightly different meanings in the gay community. In this context they are just generic terms that do not imply whether the player is heavily into D&S or not.
all masters are dominants all dominants are tops all slaves are submissives all submissives are bottoms
but not necessarily vice versa