Handle ROOT6 class names
Merge pull request #2260 from wmtan/HandleROOT6CLassNaming

ROOT6 -- Handle root6 class naming