Transgender encompasses any individual who crosses over or challenges their society's traditional gender roles or expression.
Take a look at this site - download their free booklet. It has an infographic on what is under the transgender umbrella.
http://www.thegenderbook.com/