Improve naming in term canonization when handling HO variables (#7660)