Yep. If you have to bring the aspect up, then "trans" is the umbrella term. Typically, "transgender" is the longform commonly used. While "transsexual" is a legitimate term, that's getting into the physical "what is in your pants?" or "are you on hormones?" thing again.
Unlike "tranny", "trans"...