Small cleanup of db model.

* some params removed from constructors
* simplification of some property names

Change-Id: Iff8c08a7a0a1a28e1b10ea7264183eca7fae3215