Rename DomainGroupDomainVersion to DomainAndVersion