Hmmm, tricky. I have that in book three when a certain major character becomes a spy. I didn't have as much trouble with the switch of name though.

When you get ready to share, let me know. (Rubs hands together)