Transgender and gender nonbinary (TGNB) individuals are at high risk for HIV acquisition. However, TGNB individuals are often excluded from research and public health surveillance, both as participants and as reported sexual partners. This research study aimed to be inclusive, correctly classify TGNB participants, and accurately describe sex partners and sexual activity of participants to assess HIV risk while minimizing participant burden. The adaptation of survey questions designed for cisgender men to include TGNB participants and partners was feasible and relatively straightforward. However, additional work is still needed in this area to increase inclusivity and research participation by TGNB individuals. Clinical Trial Registration Number - NCT03584282., Competing Interests: No competing financial interests exist., (Copyright 2023, Mary Ann Liebert, Inc., publishers.)