Removed ID with 2 subterms.
Fixed lookup of non-unique definitions.
Specify namespace and name to resolve separately in Resolve term.