Deconflict templated test names from public symbols and update test references.