I've had a passport as Tom since the beginning and before all the heightened security stuff after 9/11 and I've always preferred being called Tom so that was what I put on the original application when young and stupid. And yes, everything except the passport says Thomas. I had a little trouble checking in for a flight Tokyo to LAX and they suggested I get it changed so everything matched. I thought it would be a simple task, but apparently not so much.

I suppose I could let it expire and then apply for a new one rather than renew the Tom one.