Fixed name resolution usage in collect-constraints. Now using NaBL URIs to identify names if possible.