Tangential, but my wife is nonbinary and I still call them my wife. They’re okay with it. And I don’t mean to be lewd, but in bed they like to be called Daddy instead of Mommy. My point is that it’s probably a case by case thing without a universal and some nonbinary folks don’t mind some gendered terms. It might even be context based.