[NAN] Rename to make discovery explicit [DO NOT MERGE]

Pure rename operation - no other functional changes.

Bug: 31470256
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
11 files changed