Hawaii and Gender specific paper

We are also booked for Hawaii...and unfortunately the paper pusher people that require gender specific things on paper, He has to fly at Makenzie Ann.. Female.  I feel it's gonna be more of an issue, putting that name and gender, then walking in with a "male" person.  I guess we will see how it goes.  Also by then he will legally BE Max, but at the time of booking it was Makenzie.  So I don't know how to go about changing it OR IF we can change it.  I'm sure there has got to be married people that changed their names legally and now their ID is different.  What a PITA they are creating over there at the TSA.