Rename domain -> entity
Refactoring