[NAN] Method renames based on API council feedback [DO NOT MERGE]
am: 34a0342ab5  -s ours

Change-Id: I7b1a2349ef563380e60a25c831fd5bbf48851fa4