Ensure we disambiguate NTTP names when doing TemplateTree comparisons

835b99e4 did this when we printed the NTTPs while NOT doing a
TemplateTree comparison, this does the same change for the TemplateTree
mechanism as well, amking the diagnostics less confusing in these cases.

Fixes: #66744