Use correct Root6 type names
Merge pull request #2189 from wmtan/UseCorrectRoot6TypeNames

Use correct Root6 type names