Switched to RDomList, IHasName
Cleanup