Best solution would be if you agree on like a other name with your gf something she alrdy calls you like babe or so , but it should be okay to usw in public.

I for example dont call my gf by her name so even if she would change her name, it wouldnt matter for us.