CMS-2002 Rename facet domain objects

Rename to name representing the domain better