replaces
Rename dao -> entity