^^ 100% this.
Just to note: once you have the passport, I'd be hard-pressed to think of a single circumstance where anyone would need to see the citizenship certificate and insist it be an updated version with new name. (Honestly apart from passport not many circumstances where cit certificate needed at all).
That said, if you want it updated, no problem, just it'll take a while.