Add an opnion to use advertised name for renaming

Test: Use new API, make sure renaming works
Change-Id: I6347907df29cc314e8847eb4d55b4fe3a8c1c0eb
4 files changed