Renamed ContactDomain to DomainContact
Renamed ContactAccount to EmailAccountContact