I kept the last name both times because it was too much of a PITA to change everything.