Rename invariant_fields by common_fields