Refactored domain class names