Revision of naming.

- rename db entities
- rename class members