Merge "[NAN] Rename to make discovery explicit"