Rename local variable to canonical_need