I probably didn't articulate well but my basic go-to conception is "gender as social construction" (incl. who can or cannot be part of a gendered category) -> "gender as self-determination". 

I'm happy to be corrected/criticized though...