updated all 'id' fields to Name for math