Changed name of some database entities. Separated Client and User