Refactored Domain-Classes (Naming)