[DO NOT MERGE] Add an opnion to use advertised name for renaming

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