Renamed user entity and model