New name resolution.
Resolve is faster now.
Migrated to new resolve.