CMS-2286 Refactoring: Item domain naming

More renaming