Renamed Client entity to User entity.