What titles apply to non-monastic/lay Buddhists? (upasaka/upasika savaka/sravaka) Labels are illusions like all conditioned phenomena, but I have an attachment to taxonomy and being able to describe myself accurately. I'm working on that, but in the meantime, I thought this would be a good question for the stack. 

How best can people describe themselves in the hierarchy/ecology of believers if they aren't living the monastic life of the Bhikkhu/Bhikkhuṇī (monk/nun), but still consider themselves as living a life driven by the dhamma?

I personally identify as Theravada/Pali canon/early Bhuddism, but an answer specifying Mahayana/Vajrayana titles is also welcome!

Ideally I'd like Pali words and their best English equivalents, but obviously including Sanskrit versions too would be polite (^_^)

BONUS POINTS: My gender is non-binary (genderqueer/agender) and thus I really need a title that can apply to me without need to specify gender. If I ever become a monastic I will really have my work cut out for me and/or a need to compromise, but for any non-monastics with non-binary gender, which titles are functional for us?
you might get a few answers but here is my thought:

Śrāvaka (Sanskrit) or Sāvaka (Pali) means "hearer" or, more generally, or"disciple", or "one who sits near", "one who lend ears"

Gender neutral and describes all level of achievements.