CMS-2286 Refactoring: Item domain naming

More renaming, some refactoring and added tests