I actually was involved in gender studies, and we had the distinction, sex (biological), Gender (social and psychological), and sexuality. But this has all slipped sideways, once people started using gender to mean sex.
Self identification, as I was saying, has always been used, but trans people have ruffled feathers by opting for a different identity, than the one given to them, as Steve describes it, you are a man, because I say so.