Renamed id fields, also userId and UserId