Refactored Domain and Field names