We had this issue for a while last year, so now we are mummy & daddy when Zander is around. I call out "daddy" when I want Aaron for anything now, it's hard to switch back when Zander's asleep though LOL!
My Nan and Pop call each other Mum and Dad all the time. Even when it's just them, lol.