checked in Mark's entity canonical name code