Added checks for PROP_ and CPROP_ and hrc_ in root node naming as it
appears we are having problems naming the root nodes correctly as stated
in the wiki