Merge "[NAN] Method renames based on API council feedback"