#: Domain object name refactor