orangepie, I agree, though Stonewall disagrees as they define trans as: "an umbrella term to describe people whose gender is not the same as, or does not sit comfortably with, the sex they were assigned at birth. Trans people may describe themselves using one or more of a wide variety of terms, including (but not limited to) Transgender, Transsexual, Gender-queer (GQ), Gender-fluid, Non-binary, Gender-variant, Crossdresser, Genderless, Agender, Nongender, Third gender, Two-spirit, Bi-gender, Trans man, Trans woman,Trans masculine, Trans feminine and Neutrois."
Tavistock does recognize that others disagree with that idea but Stonewall is the major voice in schools and business and stuff and they've put a lot of people together who don't want to be.
Also, gender nonconforming just means not confirming to sex roles. Anyone of any identity can be gender nonconforming. Genderfluid is a different thing.