Ensure claim_name_output is always constructed with a valid name