Don't know if you have seen this. It was in the news in my country.

"Under current proposals to the ICD-11 working group, transgender identities would no longer be classified as "Transsexualism" under the category of "Mental health and disorders" but would be classified as "Gender incongruence of adolescence and adulthood" under the category of "Conditions related to sexual health"."

http://www.who.int/bulletin/volumes/95/2/16-183913/en/

Bulletin of the World Health Organization

My codes changed along this journey from Gender Identity Disorder to Gender Dysphoria and Transsexualism.  Efforts to change the codes to more open ended classifications seems like the better way to go.