http://businessportals.verizonwireless.com/assets/files/SecurityWP.pdf
It says NAI is used with HA/AAA during authentication, so yeh, those need to be changed. An explanation/confirmation from you is so cool, what is your specialty? I am curious. I am j2ee, nothing to do with wireless.