Unify field names with actual index names