Discuss with the pupil what they want.
Make available unisex toilets or accessible toilets (avoid the term disabled toilet).
Make sure that PE teachers are using neutral terms and really think about the use of girls and boys teams what is their function?