3 year rule, we just took our time with it.
Surname change; we have her green card and SSN card in our (my family) name, but her Ukraine passport is still in her maiden name. We've applied to have it changed with her citizenship and US Passport.
If we face delays we could have the Ukranian consulate change the surname on her passport--this was nearly a problem as we were exiting the EU this summer.