CMS-2286 Refactoring: Item domain naming

Started refactoring
CMS-2286 Refactoring: Item domain naming

Started refactoring