Use correct ROOT6 name in all cases
Merge pull request #2638 from wmtan/UseCorrectROOT6NameForString

Use correct ROOT6 name in all cases