ISIS-233-ro: more on domainservice.serviceId

* and lots of renaming of existing test classes.