Rename CitizenEntity to User