Aligned entity type column names to ‘__entityType’ for all uses