I think Gender Identity Disorder needs to be relabeled something like ‘Sex-Gender Disassociation’ because calling it a disorder gives the connotation that there is something mentally wrong with people who feel as if they were born in the wrong body. There’s nothing wrong with who they are or how they think.
The good news is that, yes, they’re going to stop calling it a disorder (though how long it takes doctors and laypeople to get the old term out of their vocabulary is debatable). As of the release of the DSM-V in May, the proper term is now “gender dysphoria”. Here’s the official fact sheet from the DSM: