Add name to Root identifiers
Improve accuracy of unit argument to resolver lookup functions