Added fix from Peter Van der Beken to fix Name conflicts with NodeType tokens Added fix to bug reported by Axel Hecht (#42502) git-svn-id: svn://10.0.0.236/trunk@72538 18797224-902f-48f8-a5cc-f745e15eee43