Updated Device ID / Name functions to not use Type Def Prop Node for better RT support.