The term "transgender" functions as an umbrella term. It includes:

People whose identity falls outside the traditional male/female binary, sometimes identifying as both, neither, or a completely different gender.