Don't forget the "rename domain" case.

see #603