Rename invariant_fields by common_fields
Rename invariant_fields by common_fields